diff options
| -rw-r--r-- | integrations/integration_test.go | 10 | ||||
| -rw-r--r-- | models/models.go | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/integrations/integration_test.go b/integrations/integration_test.go index 36e0682099..3942d54410 100644 --- a/integrations/integration_test.go +++ b/integrations/integration_test.go @@ -198,16 +198,6 @@ func initIntegrationTest() { } } - // Make the user's default search path the created schema; this will affect new connections - if _, err = db.Exec(fmt.Sprintf(`ALTER USER "%s" SET search_path = %s`, setting.Database.User, setting.Database.Schema)); err != nil { - log.Fatalf("db.Exec: ALTER USER SET search_path: %v", err) - } - - // Make the current connection's search the created schema - if _, err = db.Exec(fmt.Sprintf(`SET search_path = %s`, setting.Database.Schema)); err != nil { - log.Fatalf("db.Exec: ALTER USER SET search_path: %v", err) - } - case setting.Database.UseMSSQL: host, port := setting.ParseMSSQLHostPort(setting.Database.Host) db, err := sql.Open("mssql", fmt.Sprintf("server=%s; port=%s; database=%s; user id=%s; password=%s;", diff --git a/models/models.go b/models/models.go index 32df9bdfd8..6aaa26d627 100644 --- a/models/models.go +++ b/models/models.go @@ -155,6 +155,16 @@ func getEngine() (*xorm.Engine, error) { engine.Dialect().SetParams(map[string]string{"DEFAULT_VARCHAR": "nvarchar"}) } engine.SetSchema(setting.Database.Schema) + if setting.Database.UsePostgreSQL && len(setting.Database.Schema) > 0 { + // Add the schema to the search path + if _, err := engine.Exec(`SELECT set_config( + 'search_path', + ? || ',' || current_setting('search_path'), + false)`, + setting.Database.Schema); err != nil { + return nil, err + } + } return engine, nil } |