Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for database schema in PostgreSQL #8819

Merged
merged 17 commits into from
Jan 20, 2020
Merged

Add support for database schema in PostgreSQL #8819

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d07281d
Add support for database schema
guillep2k Nov 4, 2019
5e2dd6d
Require setting search_path for the db user
guillep2k Nov 5, 2019
0169953
Merge branch 'master' into fix-5152
guillep2k Nov 29, 2019
b3e4c98
Merge branch 'master' into fix-5152
guillep2k Dec 19, 2019
b7f7816
Add schema setting to admin/config.tmpl
guillep2k Dec 19, 2019
f29a49f
Merge branch 'master' into fix-5152
sapk Dec 19, 2019
d2d37d2
Merge branch 'master' into fix-5152
sapk Dec 19, 2019
40e2284
Merge branch 'master' into fix-5152
lunny Dec 20, 2019
45bfbb1
Merge branch 'master' into fix-5152
guillep2k Jan 6, 2020
c3d051d
Use a schema different from default for psql tests
guillep2k Jan 6, 2020
e8c9559
Update postgres scripts to use custom schema
guillep2k Jan 6, 2020
aed2ded
Merge branch 'master' into fix-5152
sapk Jan 14, 2020
75f1320
Merge branch 'master' into fix-5152
guillep2k Jan 20, 2020
16c58b1
Update to xorm/core 0.7.3 and xorm/xorm c37aff9b3a
guillep2k Jan 20, 2020
4cba8fd
Merge branch 'fix-5152' of github.com:guillep2k/gitea into fix-5152
guillep2k Jan 20, 2020
b16d5af
Fix migration test
guillep2k Jan 20, 2020
2cdda3d
Merge branch 'master' into fix-5152
lunny Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add schema setting to admin/config.tmpl
  • Loading branch information
@guillep2k
guillep2k committed Dec 19, 2019
commit b7f781639e2d212fbe0f3e716272d2412d7e29b9
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1918,6 +1918,7 @@ config.db_type = Type
config.db_host = Host
config.db_name = Name
config.db_user = Username
config.db_schema = Schema
config.db_ssl_mode = SSL
config.db_path = Path

Expand Down
2 changes: 2 additions & 0 deletions templates/admin/config.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@
<dd>{{if .DbCfg.User}}{{.DbCfg.User}}{{else}}-{{end}}</dd>
{{end}}
{{if eq .DbCfg.Type "postgres"}}
<dt>{{.i18n.Tr "admin.config.db_schema"}}</dt>
<dd>{{if .DbCfg.Schema}}{{.DbCfg.Schema}}{{else}}-{{end}}</dd>
<dt>{{.i18n.Tr "admin.config.db_ssl_mode"}}</dt>
<dd>{{if .DbCfg.SSLMode}}{{.DbCfg.SSLMode}}{{else}}-{{end}}</dd>
{{end}}
Expand Down