summaryrefslogtreecommitdiff
path: root/internal/db
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2022-01-30 17:06:28 +0100
committerLibravatar GitHub <noreply@github.com>2022-01-30 17:06:28 +0100
commit959e38ac5c2c2bce82446ed6368f730b4dd01b4a (patch)
tree8c06e0b2a651bb696812ef074c42bd4f5f2dd300 /internal/db
parent[bug] Fix minimum description length check (#369) (diff)
downloadgotosocial-959e38ac5c2c2bce82446ed6368f730b4dd01b4a.tar.xz
[bug] Fix sqlite empty address issue (#370)
* error when empty address has been set for sqlite * better explain sqlite db-address setting
Diffstat (limited to 'internal/db')
-rw-r--r--internal/db/bundb/bundb.go4
-rw-r--r--internal/db/bundb/bundbnew_test.go52
2 files changed, 56 insertions, 0 deletions
diff --git a/internal/db/bundb/bundb.go b/internal/db/bundb/bundb.go
index 47fe4fb47..ebdbc4ba2 100644
--- a/internal/db/bundb/bundb.go
+++ b/internal/db/bundb/bundb.go
@@ -204,7 +204,11 @@ func NewBunDBService(ctx context.Context) (db.DB, error) {
}
func sqliteConn(ctx context.Context) (*DBConn, error) {
+ // validate db address has actually been set
dbAddress := viper.GetString(config.Keys.DbAddress)
+ if dbAddress == "" {
+ return nil, fmt.Errorf("'%s' was not set when attempting to start sqlite", config.Keys.DbAddress)
+ }
// Drop anything fancy from DB address
dbAddress = strings.Split(dbAddress, "?")[0]
diff --git a/internal/db/bundb/bundbnew_test.go b/internal/db/bundb/bundbnew_test.go
new file mode 100644
index 000000000..40a05cb50
--- /dev/null
+++ b/internal/db/bundb/bundbnew_test.go
@@ -0,0 +1,52 @@
+/*
+ GoToSocial
+ Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package bundb_test
+
+import (
+ "context"
+ "testing"
+
+ "github.com/spf13/viper"
+ "github.com/stretchr/testify/suite"
+ "github.com/superseriousbusiness/gotosocial/internal/config"
+ "github.com/superseriousbusiness/gotosocial/internal/db/bundb"
+)
+
+type BundbNewTestSuite struct {
+ BunDBStandardTestSuite
+}
+
+func (suite *BundbNewTestSuite) TestCreateNewDB() {
+ // create a new db with standard test settings
+ db, err := bundb.NewBunDBService(context.Background())
+ suite.NoError(err)
+ suite.NotNil(db)
+}
+
+func (suite *BundbNewTestSuite) TestCreateNewSqliteDBNoAddress() {
+ // create a new db with no address specified
+ viper.Set(config.Keys.DbAddress, "")
+ db, err := bundb.NewBunDBService(context.Background())
+ suite.EqualError(err, "'db-address' was not set when attempting to start sqlite")
+ suite.Nil(db)
+}
+
+func TestBundbNewTestSuite(t *testing.T) {
+ suite.Run(t, new(BundbNewTestSuite))
+}