summaryrefslogtreecommitdiffstats
path: root/models/models.go
diff options
context:
space:
mode:
authorskyblue <ssx205@gmail.com>2014-04-05 22:46:32 +0800
committerskyblue <ssx205@gmail.com>2014-04-05 22:46:32 +0800
commitce350a737a63aeb4e2ca5924adf28862a6a6cfb1 (patch)
treeb77b30927de35ea7c4367fe347a6ad19e3f11fc4 /models/models.go
parentb0e7dd6864717841dd218af93dd8bd30d198128d (diff)
downloadgitea-ce350a737a63aeb4e2ca5924adf28862a6a6cfb1.tar.gz
gitea-ce350a737a63aeb4e2ca5924adf28862a6a6cfb1.zip
update models, add licence in start.sh
Diffstat (limited to 'models/models.go')
-rw-r--r--models/models.go17
1 files changed, 11 insertions, 6 deletions
diff --git a/models/models.go b/models/models.go
index 384f1fc425..0dc4d51e7c 100644
--- a/models/models.go
+++ b/models/models.go
@@ -18,7 +18,9 @@ import (
)
var (
- orm *xorm.Engine
+ orm *xorm.Engine
+ tables []interface{}
+
HasEngine bool
DbCfg struct {
@@ -28,6 +30,11 @@ var (
UseSQLite3 bool
)
+func init() {
+ tables = append(tables, new(User), new(PublicKey), new(Repository), new(Watch),
+ new(Action), new(Access), new(Issue), new(Comment))
+}
+
func LoadModelsConfig() {
DbCfg.Type = base.Cfg.MustValue("database", "DB_TYPE")
if DbCfg.Type == "sqlite3" {
@@ -58,9 +65,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
if err != nil {
return fmt.Errorf("models.init(fail to conntect database): %v\n", err)
}
-
- return x.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
- new(Action), new(Access), new(Issue), new(Comment))
+ return x.Sync(tables...)
}
func SetEngine() (err error) {
@@ -102,8 +107,8 @@ func SetEngine() (err error) {
func NewEngine() (err error) {
if err = SetEngine(); err != nil {
return err
- } else if err = orm.Sync(new(User), new(PublicKey), new(Repository), new(Watch),
- new(Action), new(Access), new(Issue), new(Comment)); err != nil {
+ }
+ if err = orm.Sync(tables...); err != nil {
return fmt.Errorf("sync database struct error: %v\n", err)
}
return nil