From 25fd495b2e790001e9c138205606ec4fa16bf129 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Sat, 12 Apr 2014 11:48:12 -0700 Subject: [PATCH] Add sqlite build tag This adds a sqlite build tag so that you don't have to have the sqlite import commented out in code and users can run: go build -tags sqlite if they want to have sqlite support enabled. It is disabled by default so nothing changes with the default go get or build commands. --- models/models.go | 7 +++---- models/models_sqlite.go | 11 +++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 models/models_sqlite.go diff --git a/models/models.go b/models/models.go index ee96207d10..3e3dbbf80c 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" +)