#1400 use new connstr format for postgres

tokarchuk/v1.17
Unknwon 9 years ago
parent 3ff708b749
commit 42a2c5ca54
  1. 6
      .gopmfile
  2. 2
      gogs.go
  3. 2
      models/models.go
  4. 2
      templates/.VERSION

@ -10,11 +10,11 @@ github.com/Unknwon/macaron =
github.com/Unknwon/paginater = github.com/Unknwon/paginater =
github.com/codegangsta/cli = commit:2bcd11f863 github.com/codegangsta/cli = commit:2bcd11f863
github.com/go-sql-driver/mysql = commit:a197e5d405 github.com/go-sql-driver/mysql = commit:a197e5d405
github.com/go-xorm/core = commit:be6e7ac47d github.com/go-xorm/core =
github.com/go-xorm/xorm = commit:1f0dd9bef2 github.com/go-xorm/xorm =
github.com/gogits/chardet = commit:2404f77725 github.com/gogits/chardet = commit:2404f77725
github.com/gogits/go-gogs-client = commit:92e76d616a 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/binding =
github.com/macaron-contrib/cache = commit:928d5c35cd github.com/macaron-contrib/cache = commit:928d5c35cd
github.com/macaron-contrib/captcha = github.com/macaron-contrib/captcha =

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.3.0730 Beta" const APP_VER = "0.6.3.0731 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

@ -105,7 +105,7 @@ func getEngine() (*xorm.Engine, error) {
if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 { if len(fields) > 1 && len(strings.TrimSpace(fields[1])) > 0 {
port = fields[1] 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) DbCfg.User, DbCfg.Passwd, host, port, DbCfg.Name, DbCfg.SSLMode)
case "sqlite3": case "sqlite3":
if !EnableSQLite3 { if !EnableSQLite3 {

@ -1 +1 @@
0.6.3.0730 Beta 0.6.3.0731 Beta
Loading…
Cancel
Save