diff options
| author | guillep2k <18600385+guillep2k@users.noreply.github.com> | 2020-01-20 12:45:14 -0300 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2020-01-20 16:45:14 +0100 |
| commit | ad1b6d439fe0e0875e54227e0bc23a74411f490e (patch) | |
| tree | 8e16e25a913d167ebb772ad2e0e92cbba9c56b66 /models | |
| parent | 6d6f1d568ec36786b1020f4b43cbd872228c6633 (diff) | |
| download | gitea-ad1b6d439fe0e0875e54227e0bc23a74411f490e.tar.gz gitea-ad1b6d439fe0e0875e54227e0bc23a74411f490e.zip | |
Add support for database schema in PostgreSQL (#8819)
* Add support for database schema
* Require setting search_path for the db user
* Add schema setting to admin/config.tmpl
* Use a schema different from default for psql tests
* Update postgres scripts to use custom schema
* Update to xorm/core 0.7.3 and xorm/xorm c37aff9b3a
* Fix migration test
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/models.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/models/models.go b/models/models.go index 9eb174e200..74680d847a 100644 --- a/models/models.go +++ b/models/models.go @@ -128,7 +128,12 @@ func getEngine() (*xorm.Engine, error) { return nil, err } - return xorm.NewEngine(setting.Database.Type, connStr) + engine, err := xorm.NewEngine(setting.Database.Type, connStr) + if err != nil { + return nil, err + } + engine.SetSchema(setting.Database.Schema) + return engine, nil } // NewTestEngine sets a new test xorm.Engine |