diff --git a/main.go b/main.go index 46951e1..3793e0d 100644 --- a/main.go +++ b/main.go @@ -10,6 +10,7 @@ import ( "github.com/astaxie/beego/logs" "github.com/astaxie/beego/orm" _ "github.com/go-sql-driver/mysql" + _ "github.com/mattn/go-sqlite3" ) var ( @@ -18,10 +19,21 @@ var ( func init() { log.SetLogger("console", "") + url := "" + db := "" + if database.DatabaseInstance == database.MySQL { + // MySQL + orm.RegisterDriver(database.MySQL, orm.DR_MySQL) + url = database.UserDB + ":" + database.PwdDB + "@/" + database.DataBase + "?charset=utf8" + db = "mysql" + } else { + // SQLite + orm.RegisterDriver(database.SQLITE, orm.DR_Sqlite) + url = "datahouse.db" + db = "sqlite3" + } - orm.RegisterDriver("mysql", orm.DR_MySQL) - url := database.UserDB + ":" + database.PwdDB + "@/" + database.DataBase + "?charset=utf8" - err := orm.RegisterDataBase(database.Alias, "mysql", url) + err := orm.RegisterDataBase(database.Alias, db, url) if err != nil { log.Error("Failed to register database", err) } diff --git a/models/database/constantes.go b/models/database/constantes.go index e385f36..3de7d50 100644 --- a/models/database/constantes.go +++ b/models/database/constantes.go @@ -5,9 +5,13 @@ import ( ) var ( + SQLITE = "sqlite" + MySQL = "mysql" Alias = "default" - UserDB = beego.AppConfig.String("mysqluser") - PwdDB = beego.AppConfig.String("mysqlpass") - HostDB = beego.AppConfig.String("mysqlurls") - DataBase = beego.AppConfig.String("mysqldb") + + DatabaseInstance = beego.AppConfig.String("database") + UserDB = beego.AppConfig.String("mysqluser") + PwdDB = beego.AppConfig.String("mysqlpass") + HostDB = beego.AppConfig.String("mysqlurls") + DataBase = beego.AppConfig.String("mysqldb") ) diff --git a/models/variables/variables.go b/models/variables/variables.go index ed4ed58..2358bba 100644 --- a/models/variables/variables.go +++ b/models/variables/variables.go @@ -1,7 +1,7 @@ package variables const ( - Version = "0.0.4" + Version = "0.0.4.1" SessionName = "Session_Data_House" diff --git a/views/temp.tpl b/views/temp.tpl index b2c7170..291dba8 100644 --- a/views/temp.tpl +++ b/views/temp.tpl @@ -8,7 +8,18 @@