From 23bba7633bbd8ae8f9f41404352c327f9e8c9fdc Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 12 Apr 2014 16:24:09 -0400 Subject: [PATCH] Mirror fix on sqlite3 tag --- models/models.go | 6 +++++- models/models_sqlite.go | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/models/models.go b/models/models.go index 010228aed3..b8374a3d67 100644 --- a/models/models.go +++ b/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: diff --git a/models/models_sqlite.go b/models/models_sqlite.go index 02c3f58249..1d80823fe5 100644 --- a/models/models_sqlite.go +++ b/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 +}