diff options
author | skyblue <ssx205@gmail.com> | 2014-04-05 22:52:24 +0800 |
---|---|---|
committer | skyblue <ssx205@gmail.com> | 2014-04-05 22:52:24 +0800 |
commit | c22d3503fd65ec95fd215b395be059392bf90d87 (patch) | |
tree | c0ec2b4cd2bae6ce4f8e02e3dcc14add74658fb8 /models/models.go | |
parent | a92826a8feee904440d86fd851ac4ecce35520fd (diff) | |
parent | ce350a737a63aeb4e2ca5924adf28862a6a6cfb1 (diff) | |
download | gitea-c22d3503fd65ec95fd215b395be059392bf90d87.tar.gz gitea-c22d3503fd65ec95fd215b395be059392bf90d87.zip |
add oauth2 table init
Diffstat (limited to 'models/models.go')
-rw-r--r-- | models/models.go | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/models/models.go b/models/models.go index 0ad863371c..ee96207d10 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), new(Oauth2)) +} + 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", 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,9 +107,9 @@ 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 { - return fmt.Errorf("sync database struct error: %v", err) + } + if err = orm.Sync(tables...); err != nil { + return fmt.Errorf("sync database struct error: %v\n", err) } return nil } |