mirror of
https://github.com/go-gitea/gitea
synced 2024-11-10 20:24:24 +00:00
Merge branch 'master' of github.com:gogits/gogs into dev
This commit is contained in:
commit
47f3dd43a5
@ -12,7 +12,6 @@ import (
|
|||||||
_ "github.com/go-sql-driver/mysql"
|
_ "github.com/go-sql-driver/mysql"
|
||||||
_ "github.com/lib/pq"
|
_ "github.com/lib/pq"
|
||||||
"github.com/lunny/xorm"
|
"github.com/lunny/xorm"
|
||||||
// _ "github.com/mattn/go-sqlite3"
|
|
||||||
|
|
||||||
"github.com/gogits/gogs/modules/base"
|
"github.com/gogits/gogs/modules/base"
|
||||||
)
|
)
|
||||||
@ -56,9 +55,9 @@ func NewTestEngine(x *xorm.Engine) (err error) {
|
|||||||
case "postgres":
|
case "postgres":
|
||||||
x, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=%s",
|
x, err = xorm.NewEngine("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=%s",
|
||||||
DbCfg.User, DbCfg.Pwd, DbCfg.Name, DbCfg.SslMode))
|
DbCfg.User, DbCfg.Pwd, DbCfg.Name, DbCfg.SslMode))
|
||||||
// case "sqlite3":
|
case "sqlite3":
|
||||||
// os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
|
os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
|
||||||
// x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
|
x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
|
||||||
default:
|
default:
|
||||||
return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
|
return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
|
||||||
}
|
}
|
||||||
|
11
models/models_sqlite.go
Normal file
11
models/models_sqlite.go
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
// +build sqlite
|
||||||
|
|
||||||
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
|
package models
|
||||||
|
|
||||||
|
import (
|
||||||
|
_ "github.com/mattn/go-sqlite3"
|
||||||
|
)
|
Loading…
Reference in New Issue
Block a user