summaryrefslogtreecommitdiffstats
path: root/models
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-04-14 04:11:41 -0400
committerUnknown <joe2010xtmf@163.com>2014-04-14 04:11:41 -0400
commitc3c2cfebaa5cf482f59a7c25972374cdc7a3fab4 (patch)
tree91355f507d629e7d31ad325f41e7e927084a6d12 /models
parentc36e7d322e74a55749ce2c2934c6fcfa82cff274 (diff)
parent38c069308e7800601e01febce9f69536913066ee (diff)
downloadgitea-c3c2cfebaa5cf482f59a7c25972374cdc7a3fab4.tar.gz
gitea-c3c2cfebaa5cf482f59a7c25972374cdc7a3fab4.zip
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'models')
-rw-r--r--models/models.go15
1 files changed, 13 insertions, 2 deletions
diff --git a/models/models.go b/models/models.go
index d485489586..cd9dc38ac1 100644
--- a/models/models.go
+++ b/models/models.go
@@ -8,6 +8,7 @@ import (
"fmt"
"os"
"path"
+ "strings"
_ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq"
@@ -55,8 +56,18 @@ func NewTestEngine(x *xorm.Engine) (err error) {
x, err = xorm.NewEngine("mysql", fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8",
DbCfg.User, DbCfg.Pwd, DbCfg.Host, DbCfg.Name))
case "postgres":
- x, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=%s",
- DbCfg.User, DbCfg.Pwd, DbCfg.Name, DbCfg.SslMode))
+ var host, port = "127.0.0.1", "5432"
+ fields := strings.Split(DbCfg.Host, ":")
+ if len(fields) > 0 {
+ host = fields[0]
+ }
+ if len(fields) > 1 {
+ port = fields[1]
+ }
+ cnnstr := fmt.Sprintf("user=%s password=%s host=%s port=%s dbname=%s sslmode=%s",
+ DbCfg.User, DbCfg.Pwd, host, port, DbCfg.Name, DbCfg.SslMode)
+ //fmt.Println(cnnstr)
+ x, err = xorm.NewEngine("postgres", cnnstr)
case "sqlite3":
if !EnableSQLite3 {
return fmt.Errorf("Unknown database type: %s", DbCfg.Type)