Skip to content

Change parsing of postgresql settings #4275

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

Merged
merged 10 commits into from
Jun 20, 2018
Merged

Change parsing of postgresql settings #4275

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1cd364f
Change parsing of postgresql settings
techknowlogick Jun 19, 2018
cfa259d
Merge branch 'master' into techknowlogick-patch-4
techknowlogick Jun 19, 2018
6f9bc5e
Add copyright
techknowlogick Jun 19, 2018
6ac3430
Merge branch 'master' into techknowlogick-patch-4
lafriks Jun 19, 2018
ab47c4a
Merge remote-tracking branch 'upstream/master' into techknowlogick-pa…
techknowlogick Jun 19, 2018
31cb306
update postgresql connection string
techknowlogick Jun 19, 2018
b72b1cd
add tests
techknowlogick Jun 19, 2018
64a13f7
fix fmt
techknowlogick Jun 19, 2018
168f119
remove @
techknowlogick Jun 19, 2018
8296849
Merge branch 'master' into techknowlogick-patch-4
techknowlogick Jun 19, 2018
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
5 changes: 3 additions & 2 deletions models/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright 2014 The Gogs Authors. All rights reserved.
// Copyright 2018 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -217,10 +218,10 @@ func getEngine() (*xorm.Engine, error) {
host, port := parsePostgreSQLHostPort(DbCfg.Host)
if host[0] == '/' { // looks like a unix socket
connStr = fmt.Sprintf("postgres://%s:%s@:%s/%s%ssslmode=%s&host=%s",
url.QueryEscape(DbCfg.User), url.QueryEscape(DbCfg.Passwd), port, DbCfg.Name, Param, DbCfg.SSLMode, host)
url.PathEscape(DbCfg.User), url.PathEscape(DbCfg.Passwd), port, DbCfg.Name, Param, DbCfg.SSLMode, host)
} else {
connStr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s%ssslmode=%s",
url.QueryEscape(DbCfg.User), url.QueryEscape(DbCfg.Passwd), host, port, DbCfg.Name, Param, DbCfg.SSLMode)
url.PathEscape(DbCfg.User), url.PathEscape(DbCfg.Passwd), host, port, DbCfg.Name, Param, DbCfg.SSLMode)
}
case "mssql":
host, port := parseMSSQLHostPort(DbCfg.Host)
Expand Down