diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-04-12 16:19:10 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-04-12 16:19:10 -0400 |
| commit | 47f3dd43a52d05b1f12921c4e9cc3300a4a49060 (patch) | |
| tree | e7315a10e37b3f11875eb32cab3b2035e968a175 /models | |
| parent | 802a110e4255d0860c3942feffd23b2376c75eb7 (diff) | |
| parent | 25ecf562859ced8e6e84ac49ace03b595360bd26 (diff) | |
| download | gitea-47f3dd43a52d05b1f12921c4e9cc3300a4a49060.tar.gz gitea-47f3dd43a52d05b1f12921c4e9cc3300a4a49060.zip | |
Merge branch 'master' of github.com:gogits/gogs into dev
Diffstat (limited to 'models')
| -rw-r--r-- | models/models.go | 7 | ||||
| -rw-r--r-- | models/models_sqlite.go | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/models/models.go b/models/models.go index b380d0e0f2..010228aed3 100644 --- a/models/models.go +++ b/models/models.go @@ -12,7 +12,6 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/lunny/xorm" - // _ "github.com/mattn/go-sqlite3" "github.com/gogits/gogs/modules/base" ) @@ -56,9 +55,9 @@ func NewTestEngine(x *xorm.Engine) (err error) { 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)) - // case "sqlite3": - // os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm) - // x, err = xorm.NewEngine("sqlite3", DbCfg.Path) + case "sqlite3": + os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm) + x, err = xorm.NewEngine("sqlite3", DbCfg.Path) default: return fmt.Errorf("Unknown database type: %s", DbCfg.Type) } diff --git a/models/models_sqlite.go b/models/models_sqlite.go new file mode 100644 index 0000000000..02c3f58249 --- /dev/null +++ b/models/models_sqlite.go @@ -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" +) |