|
|
@ -185,9 +185,17 @@ func restoreOldDB(t *testing.T, version string) bool { |
|
|
|
db.Close() |
|
|
|
db.Close() |
|
|
|
|
|
|
|
|
|
|
|
case setting.Database.UsePostgreSQL: |
|
|
|
case setting.Database.UsePostgreSQL: |
|
|
|
db, err := sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/?sslmode=%s", |
|
|
|
var db *sql.DB |
|
|
|
|
|
|
|
var err error |
|
|
|
|
|
|
|
if setting.Database.Host[0] == '/' { |
|
|
|
|
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@/?sslmode=%s&host=%s", |
|
|
|
|
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.SSLMode, setting.Database.Host)) |
|
|
|
|
|
|
|
assert.NoError(t, err) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/?sslmode=%s", |
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.SSLMode)) |
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.SSLMode)) |
|
|
|
assert.NoError(t, err) |
|
|
|
assert.NoError(t, err) |
|
|
|
|
|
|
|
} |
|
|
|
defer db.Close() |
|
|
|
defer db.Close() |
|
|
|
|
|
|
|
|
|
|
|
_, err = db.Exec(fmt.Sprintf("DROP DATABASE IF EXISTS %s", setting.Database.Name)) |
|
|
|
_, err = db.Exec(fmt.Sprintf("DROP DATABASE IF EXISTS %s", setting.Database.Name)) |
|
|
@ -199,8 +207,13 @@ func restoreOldDB(t *testing.T, version string) bool { |
|
|
|
|
|
|
|
|
|
|
|
// Check if we need to setup a specific schema
|
|
|
|
// Check if we need to setup a specific schema
|
|
|
|
if len(setting.Database.Schema) != 0 { |
|
|
|
if len(setting.Database.Schema) != 0 { |
|
|
|
|
|
|
|
if setting.Database.Host[0] == '/' { |
|
|
|
|
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@/%s?sslmode=%s&host=%s", |
|
|
|
|
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Name, setting.Database.SSLMode, setting.Database.Host)) |
|
|
|
|
|
|
|
} else { |
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", |
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", |
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.Name, setting.Database.SSLMode)) |
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.Name, setting.Database.SSLMode)) |
|
|
|
|
|
|
|
} |
|
|
|
if !assert.NoError(t, err) { |
|
|
|
if !assert.NoError(t, err) { |
|
|
|
return false |
|
|
|
return false |
|
|
|
} |
|
|
|
} |
|
|
@ -225,8 +238,13 @@ func restoreOldDB(t *testing.T, version string) bool { |
|
|
|
db.Close() |
|
|
|
db.Close() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if setting.Database.Host[0] == '/' { |
|
|
|
|
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@/%s?sslmode=%s&host=%s", |
|
|
|
|
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Name, setting.Database.SSLMode, setting.Database.Host)) |
|
|
|
|
|
|
|
} else { |
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", |
|
|
|
db, err = sql.Open("postgres", fmt.Sprintf("postgres://%s:%s@%s/%s?sslmode=%s", |
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.Name, setting.Database.SSLMode)) |
|
|
|
setting.Database.User, setting.Database.Passwd, setting.Database.Host, setting.Database.Name, setting.Database.SSLMode)) |
|
|
|
|
|
|
|
} |
|
|
|
assert.NoError(t, err) |
|
|
|
assert.NoError(t, err) |
|
|
|
defer db.Close() |
|
|
|
defer db.Close() |
|
|
|
|
|
|
|
|
|
|
|