From 42a2c5ca54974fbf24c67e10a54224c987e0aeea Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 31 Jul 2015 11:05:06 +0800 Subject: [PATCH] #1400 use new connstr format for postgres --- .gopmfile | 6 +++--- gogs.go | 2 +- models/models.go | 2 +- templates/.VERSION | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gopmfile b/.gopmfile index 4b73dee62..febc51171 100644 --- a/.gopmfile +++ b/.gopmfile @@ -10,11 +10,11 @@ github.com/Unknwon/macaron = github.com/Unknwon/paginater = github.com/codegangsta/cli = commit:2bcd11f863 github.com/go-sql-driver/mysql = commit:a197e5d405 -github.com/go-xorm/core = commit:be6e7ac47d -github.com/go-xorm/xorm = commit:1f0dd9bef2 +github.com/go-xorm/core = +github.com/go-xorm/xorm = github.com/gogits/chardet = commit:2404f77725 github.com/gogits/go-gogs-client = commit:92e76d616a -github.com/lib/pq = commit:30ed2200d7 +github.com/lib/pq = github.com/macaron-contrib/binding = github.com/macaron-contrib/cache = commit:928d5c35cd github.com/macaron-contrib/captcha = diff --git a/gogs.go b/gogs.go index eb4c3a4f6..3b736cac8 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.3.0730 Beta" +const APP_VER = "0.6.3.0731 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/models.go b/models/models.go index b7986fed1..44fd56313 100644 --- a/models/models.go +++ b/models/models.go @@ -105,7 +105,7 @@ func getEngine() (*xorm.Engine, error) { if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 { port = fields[1] } - cnnstr = fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s", + cnnstr = fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=%s", DbCfg.User, DbCfg.Passwd, host, port, DbCfg.Name, DbCfg.SSLMode) case "sqlite3": if !EnableSQLite3 { diff --git a/templates/.VERSION b/templates/.VERSION index c7d8ff766..302c5cc49 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.3.0730 Beta \ No newline at end of file +0.6.3.0731 Beta \ No newline at end of file