1 files changed, 10 insertions, 0 deletions
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
 }