Revert back to using file URI for sqlite dsn (#2731)

temporalio · Apr 20, 2022 · d98c7f0 · d98c7f0
1 parent 762bf91
commit d98c7f0
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/common/persistence/sql/sqlPersistenceTest.go b/common/persistence/sql/sqlPersistenceTest.go
@@ -154,7 +154,7 @@ func (s *TestCluster) CreateDatabase() {
 func (s *TestCluster) DropDatabase() {
 	cfg2 := s.cfg
 
-	if cfg2.PluginName == "sqlite" {
+	if cfg2.PluginName == "sqlite" && cfg2.DatabaseName != ":memory:" && cfg2.ConnectAttributes["mode"] != "memory" {
 		if len(cfg2.DatabaseName) > 3 { // 3 should mean not ., .., empty, or /
 			err := os.Remove(cfg2.DatabaseName)
 			if err != nil {

diff --git a/common/persistence/sql/sqlplugin/sqlite/plugin.go b/common/persistence/sql/sqlplugin/sqlite/plugin.go
@@ -158,7 +158,7 @@ func buildDSN(cfg *config.SQL) (string, error) {
 		return "", err
 	}
 	dsn := fmt.Sprintf(
-		"%s?%v",
+		"file:%s?%v",
 		cfg.DatabaseName,
 		vals.Encode(),
 	)

diff --git a/common/persistence/sql/sqlplugin/tests/sqlite_test.go b/common/persistence/sql/sqlplugin/tests/sqlite_test.go
@@ -384,7 +384,7 @@ func newSQLiteMemoryConfig() *config.SQL {
 			"cache": "private",
 		},
 		PluginName:   sqlite.PluginName,
-		DatabaseName: ":memory:",
+		DatabaseName: "default",
 	}
 }
 

diff --git a/common/persistence/tests/sqlite_test.go b/common/persistence/tests/sqlite_test.go
@@ -319,7 +319,7 @@ func NewSQLiteMemoryConfig() *config.SQL {
 		ConnectAddr:       environment.Localhost,
 		ConnectProtocol:   "tcp",
 		PluginName:        "sqlite",
-		DatabaseName:      ":memory:",
+		DatabaseName:      "default",
 		ConnectAttributes: map[string]string{"mode": "memory", "cache": "private"},
 	}
 }

diff --git a/config/development_sqlite.yaml b/config/development_sqlite.yaml
@@ -36,7 +36,6 @@ persistence:
         connectAttributes:
           mode: "memory"
           cache: "private"
-          setup: true
         maxConns: 1
         maxIdleConns: 1
         maxConnLifetime: "1h"