diff --git a/codes.go b/codes.go index 6f93fd6..8302e70 100644 --- a/codes.go +++ b/codes.go @@ -34,12 +34,6 @@ func NewCodesMysql(c *Client, dsn string) (*Codes, error) { return nil, err } db.SetMapper(core.SameMapper{}) - if err := db.Sync2(new(CodeModel)); err != nil { - return nil, err - } - if err := db.Sync2(new(UpdateModel)); err != nil { - return nil, err - } return NewCodes(c, db) } @@ -62,6 +56,12 @@ func NewCodesSqlite(c *Client, filenames ...string) (*Codes, error) { } db.SetMapper(core.SameMapper{}) db.DB().SetMaxOpenConns(1) + + return NewCodes(c, db) +} + +func NewCodes(c *Client, db *xorm.Engine) (*Codes, error) { + if err := db.Sync2(new(CodeModel)); err != nil { return nil, err } @@ -69,11 +69,6 @@ func NewCodesSqlite(c *Client, filenames ...string) (*Codes, error) { return nil, err } - return NewCodes(c, db) -} - -func NewCodes(c *Client, db *xorm.Engine) (*Codes, error) { - update := new(UpdateModel) { //查询或者插入一条数据 has, err := db.Get(update) @@ -366,7 +361,7 @@ type UpdateModel struct { } func (*UpdateModel) TableName() string { - return "update" + return "codes_update" } type CodeModel struct { diff --git a/workday.go b/workday.go index 17fb0f0..0e43990 100644 --- a/workday.go +++ b/workday.go @@ -24,9 +24,6 @@ func NewWorkdayMysql(c *Client, dsn string) (*Workday, error) { return nil, err } db.SetMapper(core.SameMapper{}) - if err := db.Sync2(new(WorkdayModel)); err != nil { - return nil, err - } return NewWorkday(c, db) } @@ -47,14 +44,15 @@ func NewWorkdaySqlite(c *Client, filenames ...string) (*Workday, error) { } db.SetMapper(core.SameMapper{}) db.DB().SetMaxOpenConns(1) - if err := db.Sync2(new(WorkdayModel)); err != nil { - return nil, err - } return NewWorkday(c, db) } func NewWorkday(c *Client, db *xorm.Engine) (*Workday, error) { + if err := db.Sync2(new(WorkdayModel)); err != nil { + return nil, err + } + w := &Workday{ Client: c, db: db,