Browse Source

Mirror fix on sqlite3 tag

Unknown 11 years ago
parent
commit
23bba7633b
2 changed files with 11 additions and 3 deletions
  1. 5 1
      models/models.go
  2. 6 2
      models/models_sqlite.go

+ 5 - 1
models/models.go

@@ -26,7 +26,8 @@ var (
 		Type, Host, Name, User, Pwd, Path, SslMode string
 	}
 
-	UseSQLite3 bool
+	EnableSQLite3 bool
+	UseSQLite3    bool
 )
 
 func init() {
@@ -56,6 +57,9 @@ func NewTestEngine(x *xorm.Engine) (err error) {
 		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":
+		if !EnableSQLite3 {
+			return fmt.Errorf("Unknown database type: %s", DbCfg.Type)
+		}
 		os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
 		x, err = xorm.NewEngine("sqlite3", DbCfg.Path)
 	default:

+ 6 - 2
models/models_sqlite.go

@@ -1,11 +1,15 @@
-// +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.
 
+// +build sqlite
+
 package models
 
 import (
 	_ "github.com/mattn/go-sqlite3"
 )
+
+func init() {
+	EnableSQLite3 = true
+}