Skip to content

Commit 1226096

Browse files
committed
fix url field separator
1 parent e093b92 commit 1226096

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

integrations/migration-test/migration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func restoreOldDB(t *testing.T, version string) bool {
126126
err := os.MkdirAll(path.Dir(setting.Database.Path), os.ModePerm)
127127
assert.NoError(t, err)
128128

129-
db, err := sql.Open("sqlite3", fmt.Sprintf("file:%s?cache=shared&mode=rwc&_busy_timeout=%d,_txlock=immediate", setting.Database.Path, setting.Database.Timeout))
129+
db, err := sql.Open("sqlite3", fmt.Sprintf("file:%s?cache=shared&mode=rwc&_busy_timeout=%d&_txlock=immediate", setting.Database.Path, setting.Database.Timeout))
130130
assert.NoError(t, err)
131131
defer db.Close()
132132

models/unit_tests.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
8888
// CreateTestEngine creates a memory database and loads the fixture data from fixturesDir
8989
func CreateTestEngine(fixturesDir string) error {
9090
var err error
91-
x, err = xorm.NewEngine("sqlite3", "file::memory:?cache=shared,_txlock=immediate")
91+
x, err = xorm.NewEngine("sqlite3", "file::memory:?cache=shared&_txlock=immediate")
9292
if err != nil {
9393
return err
9494
}

modules/setting/database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func DBConnStr() (string, error) {
126126
if err := os.MkdirAll(path.Dir(Database.Path), os.ModePerm); err != nil {
127127
return "", fmt.Errorf("Failed to create directories: %v", err)
128128
}
129-
connStr = fmt.Sprintf("file:%s?cache=shared&mode=rwc&_busy_timeout=%d,_txlock=immediate", Database.Path, Database.Timeout)
129+
connStr = fmt.Sprintf("file:%s?cache=shared&mode=rwc&_busy_timeout=%d&_txlock=immediate", Database.Path, Database.Timeout)
130130
default:
131131
return "", fmt.Errorf("Unknown database type: %s", Database.Type)
132132
}

0 commit comments

Comments
 (0)