diff --git a/orm/db.go b/orm/db.go index db13d77b..190b0c44 100644 --- a/orm/db.go +++ b/orm/db.go @@ -208,7 +208,7 @@ func (t *dbTables) getJoinSql() (join string) { switch { case jt.fi.fieldType == RelManyToMany || jt.fi.reverse && jt.fi.reverseFieldInfo.fieldType == RelManyToMany: - c1 = jt.fi.mi.fields.pk[0].column + c1 = jt.fi.mi.fields.pk.column for _, ffi := range jt.mi.fields.fieldsRel { if jt.fi.mi == ffi.relModelInfo { c2 = ffi.column @@ -217,10 +217,10 @@ func (t *dbTables) getJoinSql() (join string) { } default: c1 = jt.fi.column - c2 = jt.fi.relModelInfo.fields.pk[0].column + c2 = jt.fi.relModelInfo.fields.pk.column if jt.fi.reverse { - c1 = jt.mi.fields.pk[0].column + c1 = jt.mi.fields.pk.column c2 = jt.fi.reverseFieldInfo.column } } @@ -263,6 +263,8 @@ func (d *dbTables) parseExprs(mi *modelInfo, exprs []string) (index, column, nam if fi.reverseFieldInfo.fieldType == RelManyToMany { mmi = fi.reverseFieldInfo.relThroughModelInfo } + default: + return } jt, _ := d.add(names, mmi, fi, fi.null == false) @@ -434,40 +436,36 @@ type dbBase struct { ins dbBaser } -func (d *dbBase) existPk(mi *modelInfo, ind reflect.Value) ([]string, []interface{}, bool) { - exist := true - columns := make([]string, 0, len(mi.fields.pk)) - values := make([]interface{}, 0, len(mi.fields.pk)) - for _, fi := range mi.fields.pk { - v := ind.Field(fi.fieldIndex) - if fi.fieldType&IsIntegerField > 0 { - vu := v.Int() - if exist { - exist = vu > 0 - } - values = append(values, vu) - } else { - vu := v.String() - if exist { - exist = vu != "" - } - values = append(values, vu) - } - columns = append(columns, fi.column) +func (d *dbBase) existPk(mi *modelInfo, ind reflect.Value) (column string, value interface{}, exist bool) { + + fi := mi.fields.pk + + v := ind.Field(fi.fieldIndex) + if fi.fieldType&IsIntegerField > 0 { + vu := v.Int() + exist = vu > 0 + value = vu + } else { + vu := v.String() + exist = vu != "" + value = vu } - return columns, values, exist + + column = fi.column + + return } func (d *dbBase) collectValues(mi *modelInfo, ind reflect.Value, skipAuto bool, insert bool) (columns []string, values []interface{}, err error) { - _, pkValues, _ := d.existPk(mi, ind) + _, pkValue, _ := d.existPk(mi, ind) for _, column := range mi.fields.orders { fi := mi.fields.columns[column] if fi.dbcol == false || fi.auto && skipAuto { continue } var value interface{} - if i, ok := mi.fields.pk.Exist(fi); ok { - value = pkValues[i] + if fi.pk { + value = pkValue } else { field := ind.Field(fi.fieldIndex) if fi.isFielder { @@ -493,9 +491,8 @@ func (d *dbBase) collectValues(mi *modelInfo, ind reflect.Value, skipAuto bool, if field.IsNil() { value = nil } else { - _, fvalues, fok := d.existPk(fi.relModelInfo, reflect.Indirect(field)) - if fok { - value = fvalues[0] + if _, vu, ok := d.existPk(fi.relModelInfo, reflect.Indirect(field)); ok { + value = vu } else { value = nil } @@ -560,17 +557,15 @@ func (d *dbBase) InsertStmt(stmt *sql.Stmt, mi *modelInfo, ind reflect.Value) (i } func (d *dbBase) Read(q dbQuerier, mi *modelInfo, ind reflect.Value) error { - pkNames, pkValues, ok := d.existPk(mi, ind) + pkColumn, pkValue, ok := d.existPk(mi, ind) if ok == false { return ErrMissPK } - pkColumns := strings.Join(pkNames, "` = ? AND `") - sels := strings.Join(mi.fields.dbcols, "`, `") colsNum := len(mi.fields.dbcols) - query := fmt.Sprintf("SELECT `%s` FROM `%s` WHERE `%s` = ?", sels, mi.table, pkColumns) + query := fmt.Sprintf("SELECT `%s` FROM `%s` WHERE `%s` = ?", sels, mi.table, pkColumn) refs := make([]interface{}, colsNum) for i, _ := range refs { @@ -578,8 +573,11 @@ func (d *dbBase) Read(q dbQuerier, mi *modelInfo, ind reflect.Value) error { refs[i] = &ref } - row := q.QueryRow(query, pkValues...) + row := q.QueryRow(query, pkValue) if err := row.Scan(refs...); err != nil { + if err == sql.ErrNoRows { + return ErrNoRows + } return err } else { elm := reflect.New(mi.addrField.Elem().Type()) @@ -618,7 +616,7 @@ func (d *dbBase) Insert(q dbQuerier, mi *modelInfo, ind reflect.Value) (int64, e } func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value) (int64, error) { - pkNames, pkValues, ok := d.existPk(mi, ind) + pkName, pkValue, ok := d.existPk(mi, ind) if ok == false { return 0, ErrMissPK } @@ -627,12 +625,11 @@ func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value) (int64, e return 0, err } - pkColumns := strings.Join(pkNames, "` = ? AND `") setColumns := strings.Join(setNames, "` = ?, `") - query := fmt.Sprintf("UPDATE `%s` SET `%s` = ? WHERE `%s` = ?", mi.table, setColumns, pkColumns) + query := fmt.Sprintf("UPDATE `%s` SET `%s` = ? WHERE `%s` = ?", mi.table, setColumns, pkName) - setValues = append(setValues, pkValues...) + setValues = append(setValues, pkValue) if res, err := q.Exec(query, setValues...); err == nil { return res.RowsAffected() @@ -643,16 +640,14 @@ func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value) (int64, e } func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value) (int64, error) { - names, values, ok := d.existPk(mi, ind) + pkName, pkValue, ok := d.existPk(mi, ind) if ok == false { return 0, ErrMissPK } - columns := strings.Join(names, "` = ? AND `") + query := fmt.Sprintf("DELETE FROM `%s` WHERE `%s` = ?", mi.table, pkName) - query := fmt.Sprintf("DELETE FROM `%s` WHERE `%s` = ?", mi.table, columns) - - if res, err := q.Exec(query, values...); err == nil { + if res, err := q.Exec(query, pkValue); err == nil { num, err := res.RowsAffected() if err != nil { @@ -660,15 +655,13 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value) (int64, e } if num > 0 { - if mi.fields.auto != nil { - ind.Field(mi.fields.auto.fieldIndex).SetInt(0) + if mi.fields.pk.auto { + ind.Field(mi.fields.pk.fieldIndex).SetInt(0) } - if len(names) == 1 { - err := d.deleteRels(q, mi, values) - if err != nil { - return num, err - } + err := d.deleteRels(q, mi, []interface{}{pkValue}) + if err != nil { + return num, err } } @@ -683,12 +676,12 @@ func (d *dbBase) UpdateBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con columns := make([]string, 0, len(params)) values := make([]interface{}, 0, len(params)) for col, val := range params { - column := snakeString(col) - if fi, ok := mi.fields.columns[column]; ok == false || fi.dbcol == false { - panic(fmt.Sprintf("wrong field/column name `%s`", column)) + if fi, ok := mi.fields.GetByAny(col); ok == false || fi.dbcol == false { + panic(fmt.Sprintf("wrong field/column name `%s`", col)) + } else { + columns = append(columns, fi.column) + values = append(values, val) } - columns = append(columns, column) - values = append(values, val) } if len(columns) == 0 { @@ -721,15 +714,13 @@ func (d *dbBase) deleteRels(q dbQuerier, mi *modelInfo, args []interface{}) erro fi = fi.reverseFieldInfo switch fi.onDelete { case od_CASCADE: - cond := NewCondition() - cond.And(fmt.Sprintf("%s__in", fi.name), args...) + cond := NewCondition().And(fmt.Sprintf("%s__in", fi.name), args...) _, err := d.DeleteBatch(q, nil, fi.mi, cond) if err != nil { return err } case od_SET_DEFAULT, od_SET_NULL: - cond := NewCondition() - cond.And(fmt.Sprintf("%s__in", fi.name), args...) + cond := NewCondition().And(fmt.Sprintf("%s__in", fi.name), args...) params := Params{fi.column: nil} if fi.onDelete == od_SET_DEFAULT { params[fi.column] = fi.initial.String() @@ -757,13 +748,8 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con where, args := tables.getCondSql(cond, false) join := tables.getJoinSql() - colsNum := len(mi.fields.pk) - cols := make([]string, colsNum) - for i, fi := range mi.fields.pk { - cols[i] = fi.column - } - colsql := fmt.Sprintf("T0.`%s`", strings.Join(cols, "`, T0.`")) - query := fmt.Sprintf("SELECT %s FROM `%s` T0 %s%s", colsql, mi.table, join, where) + cols := fmt.Sprintf("T0.`%s`", mi.fields.pk.column) + query := fmt.Sprintf("SELECT %s FROM `%s` T0 %s%s", cols, mi.table, join, where) var rs *sql.Rows if r, err := q.Query(query, args...); err != nil { @@ -772,21 +758,15 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con rs = r } - refs := make([]interface{}, colsNum) - for i, _ := range refs { - var ref interface{} - refs[i] = &ref - } + var ref interface{} args = make([]interface{}, 0) cnt := 0 for rs.Next() { - if err := rs.Scan(refs...); err != nil { + if err := rs.Scan(&ref); err != nil { return 0, err } - for _, ref := range refs { - args = append(args, reflect.ValueOf(ref).Elem().Interface()) - } + args = append(args, reflect.ValueOf(ref).Interface()) cnt++ } @@ -794,14 +774,8 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con return 0, nil } - if colsNum > 1 { - columns := strings.Join(cols, "` = ? AND `") - query = fmt.Sprintf("DELETE FROM `%s` WHERE `%s` = ?", mi.table, columns) - } else { - var sql string - sql, args = d.ins.GetOperatorSql(mi, "in", args) - query = fmt.Sprintf("DELETE FROM `%s` WHERE `%s` %s", mi.table, cols[0], sql) - } + sql, args := d.ins.GetOperatorSql(mi, "in", args) + query = fmt.Sprintf("DELETE FROM `%s` WHERE `%s` %s", mi.table, mi.fields.pk.column, sql) if res, err := q.Exec(query, args...); err == nil { num, err := res.RowsAffected() @@ -809,7 +783,7 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con return 0, err } - if colsNum == 1 && num > 0 { + if num > 0 { err := d.deleteRels(q, mi, args) if err != nil { return num, err @@ -980,14 +954,12 @@ func (d *dbBase) GetOperatorSql(mi *modelInfo, operator string, args []interface copy(params, args) sql := "" for i, arg := range args { - if len(mi.fields.pk) == 1 { - if md, ok := arg.(Modeler); ok { - ind := reflect.Indirect(reflect.ValueOf(md)) - if _, values, exist := d.existPk(mi, ind); exist { - arg = values[0] - } else { - panic(fmt.Sprintf("`%s` need a valid args value", operator)) - } + if md, ok := arg.(Modeler); ok { + ind := reflect.Indirect(reflect.ValueOf(md)) + if _, vu, exist := d.existPk(mi, ind); exist { + arg = vu + } else { + panic(fmt.Sprintf("`%s` need a valid args value", operator)) } } params[i] = arg @@ -1175,7 +1147,7 @@ setValue: value = v } case fieldType&IsRelField > 0: - fieldType = fi.relModelInfo.fields.pk[0].fieldType + fieldType = fi.relModelInfo.fields.pk.fieldType goto setValue } @@ -1236,12 +1208,12 @@ setValue: } case fieldType&IsRelField > 0: if value != nil { - fieldType = fi.relModelInfo.fields.pk[0].fieldType + fieldType = fi.relModelInfo.fields.pk.fieldType mf := reflect.New(fi.relModelInfo.addrField.Elem().Type()) md := mf.Interface().(Modeler) md.Init(md) field.Set(mf) - f := mf.Elem().Field(fi.relModelInfo.fields.pk[0].fieldIndex) + f := mf.Elem().Field(fi.relModelInfo.fields.pk.fieldIndex) field = &f goto setValue } diff --git a/orm/db_alias.go b/orm/db_alias.go index 8d474591..a0c53b97 100644 --- a/orm/db_alias.go +++ b/orm/db_alias.go @@ -9,24 +9,37 @@ import ( const defaultMaxIdle = 30 -type driverType int +type DriverType int const ( - _ driverType = iota + _ DriverType = iota DR_MySQL DR_Sqlite DR_Oracle DR_Postgres ) +type driver string + +func (d driver) Type() DriverType { + a, _ := dataBaseCache.get(string(d)) + return a.Driver +} + +func (d driver) Name() string { + return string(d) +} + +var _ Driver = new(driver) + var ( dataBaseCache = &_dbCache{cache: make(map[string]*alias)} - drivers = map[string]driverType{ + drivers = map[string]DriverType{ "mysql": DR_MySQL, "postgres": DR_Postgres, "sqlite3": DR_Sqlite, } - dbBasers = map[driverType]dbBaser{ + dbBasers = map[DriverType]dbBaser{ DR_MySQL: newdbBaseMysql(), DR_Sqlite: newdbBaseSqlite(), DR_Oracle: newdbBaseMysql(), @@ -63,6 +76,7 @@ func (ac *_dbCache) getDefault() (al *alias) { type alias struct { Name string + Driver DriverType DriverName string DataSource string MaxIdle int @@ -87,6 +101,7 @@ func RegisterDataBase(name, driverName, dataSource string, maxIdle int) { if dr, ok := drivers[driverName]; ok { al.DbBaser = dbBasers[dr] + al.Driver = dr } else { err = fmt.Errorf("driver name `%s` have not registered", driverName) goto end @@ -116,7 +131,7 @@ end: } } -func RegisterDriver(name string, typ driverType) { +func RegisterDriver(name string, typ DriverType) { if t, ok := drivers[name]; ok == false { drivers[name] = typ } else { diff --git a/orm/models.go b/orm/models.go index 8770b1ec..f0ed936a 100644 --- a/orm/models.go +++ b/orm/models.go @@ -49,6 +49,7 @@ type _modelCache struct { sync.RWMutex orders []string cache map[string]*modelInfo + done bool } func (mc *_modelCache) all() map[string]*modelInfo { diff --git a/orm/models_boot.go b/orm/models_boot.go index 7440df9e..f7ca982c 100644 --- a/orm/models_boot.go +++ b/orm/models_boot.go @@ -8,7 +8,7 @@ import ( "strings" ) -func RegisterModel(model Modeler) { +func registerModel(model Modeler) { info := newModelInfo(model) model.Init(model) table := model.GetTableName() @@ -27,9 +27,10 @@ func RegisterModel(model Modeler) { modelCache.set(table, info) } -func BootStrap() { - modelCache.Lock() - defer modelCache.Unlock() +func bootStrap() { + if modelCache.done { + return + } var ( err error @@ -59,14 +60,6 @@ func BootStrap() { } fi.relModelInfo = mii - if fi.rel { - - if mii.fields.pk.IsMulti() { - err = fmt.Errorf("field `%s` unsupport rel to multi primary key field", fi.fullName) - goto end - } - } - switch fi.fieldType { case RelManyToMany: if fi.relThrough != "" { @@ -207,6 +200,25 @@ end: fmt.Println(err) os.Exit(2) } - - runCommand() +} + +func RegisterModel(models ...Modeler) { + if modelCache.done { + panic(fmt.Errorf("RegisterModel must be run begore BootStrap")) + } + + for _, model := range models { + registerModel(model) + } +} + +func BootStrap() { + if modelCache.done { + return + } + + modelCache.Lock() + defer modelCache.Unlock() + bootStrap() + modelCache.done = true } diff --git a/orm/models_info_f.go b/orm/models_info_f.go index 9dee8a78..bd8b4e94 100644 --- a/orm/models_info_f.go +++ b/orm/models_info_f.go @@ -32,32 +32,8 @@ func (f *fieldChoices) Clone() fieldChoices { return *f } -type primaryKeys []*fieldInfo - -func (p *primaryKeys) Add(fi *fieldInfo) { - *p = append(*p, fi) -} - -func (p primaryKeys) Exist(fi *fieldInfo) (int, bool) { - for i, v := range p { - if v == fi { - return i, true - } - } - return -1, false -} - -func (p primaryKeys) IsMulti() bool { - return len(p) > 1 -} - -func (p primaryKeys) IsEmpty() bool { - return len(p) == 0 -} - type fields struct { - pk primaryKeys - auto *fieldInfo + pk *fieldInfo columns map[string]*fieldInfo fields map[string]*fieldInfo fieldsLow map[string]*fieldInfo diff --git a/orm/models_info_m.go b/orm/models_info_m.go index a6e755b7..40b4bc8d 100644 --- a/orm/models_info_m.go +++ b/orm/models_info_m.go @@ -50,41 +50,31 @@ func newModelInfo(model Modeler) (info *modelInfo) { if err != nil { break } + added := info.fields.Add(fi) if added == false { err = errors.New(fmt.Sprintf("duplicate column name: %s", fi.column)) break } + if fi.pk { if info.fields.pk != nil { err = errors.New(fmt.Sprintf("one model must have one pk field only")) break } else { - info.fields.pk.Add(fi) + info.fields.pk = fi } } - if fi.auto { - info.fields.auto = fi - } + fi.fieldIndex = i fi.mi = info } - if _, ok := info.fields.pk.Exist(info.fields.auto); info.fields.auto != nil && ok == false { - err = errors.New(fmt.Sprintf("when auto field exists, you cannot set other pk field")) - goto end - } - if err != nil { fmt.Println(fmt.Errorf("field: %s.%s, %s", ind.Type(), sf.Name, err)) os.Exit(2) } -end: - if err != nil { - fmt.Println(err) - os.Exit(2) - } return } @@ -125,6 +115,6 @@ func newM2MModelInfo(m1, m2 *modelInfo) (info *modelInfo) { info.fields.Add(fa) info.fields.Add(f1) info.fields.Add(f2) - info.fields.pk.Add(fa) + info.fields.pk = fa return } diff --git a/orm/models_test.go b/orm/models_test.go new file mode 100644 index 00000000..2003553b --- /dev/null +++ b/orm/models_test.go @@ -0,0 +1,152 @@ +package orm + +import ( + "fmt" + "os" + "time" + + _ "github.com/bmizerany/pq" + _ "github.com/go-sql-driver/mysql" + _ "github.com/mattn/go-sqlite3" +) + +type User struct { + Id int `orm:"auto"` + UserName string `orm:"size(30);unique"` + Email string `orm:"size(100)"` + Password string `orm:"size(100)"` + Status int16 `orm:"choices(0,1,2,3);defalut(0)"` + IsStaff bool `orm:"default(false)"` + IsActive bool `orm:"default(1)"` + Created time.Time `orm:"auto_now_add;type(date)"` + Updated time.Time `orm:"auto_now"` + Profile *Profile `orm:"null;rel(one);on_delete(set_null)"` + Posts []*Post `orm:"reverse(many)" json:"-"` + Manager `json:"-"` +} + +func NewUser() *User { + obj := new(User) + obj.Manager.Init(obj) + return obj +} + +type Profile struct { + Id int `orm:"auto"` + Age int16 `` + Money float64 `` + User *User `orm:"reverse(one)" json:"-"` + Manager `json:"-"` +} + +func (u *Profile) TableName() string { + return "user_profile" +} + +func NewProfile() *Profile { + obj := new(Profile) + obj.Manager.Init(obj) + return obj +} + +type Post struct { + Id int `orm:"auto"` + User *User `orm:"rel(fk)"` // + Title string `orm:"size(60)"` + Content string `` + Created time.Time `orm:"auto_now_add"` + Updated time.Time `orm:"auto_now"` + Tags []*Tag `orm:"rel(m2m)"` + Manager `json:"-"` +} + +func NewPost() *Post { + obj := new(Post) + obj.Manager.Init(obj) + return obj +} + +type Tag struct { + Id int `orm:"auto"` + Name string `orm:"size(30)"` + Posts []*Post `orm:"reverse(many)" json:"-"` + Manager `json:"-"` +} + +func NewTag() *Tag { + obj := new(Tag) + obj.Manager.Init(obj) + return obj +} + +type Comment struct { + Id int `orm:"auto"` + Post *Post `orm:"rel(fk)"` + Content string `` + Parent *Comment `orm:"null;rel(fk)"` + Created time.Time `orm:"auto_now_add"` + Manager `json:"-"` +} + +func NewComment() *Comment { + obj := new(Comment) + obj.Manager.Init(obj) + return obj +} + +var DBARGS = struct { + Driver string + Source string +}{ + os.Getenv("ORM_DRIVER"), + os.Getenv("ORM_SOURCE"), +} + +var dORM Ormer + +func init() { + RegisterModel(new(User)) + RegisterModel(new(Profile)) + RegisterModel(new(Post)) + RegisterModel(new(Tag)) + RegisterModel(new(Comment)) + + if DBARGS.Driver == "" || DBARGS.Source == "" { + fmt.Println(`need driver and source! + +Default DB Drivers. + + driver: url + mysql: https://github.com/go-sql-driver/mysql + sqlite3: https://github.com/mattn/go-sqlite3 +postgres: https://github.com/bmizerany/pq + +eg: mysql +ORM_DRIVER=mysql ORM_SOURCE="root:root@/my_db?charset=utf8" go test github.com/astaxie/beego/orm +`) + os.Exit(2) + } + + RegisterDataBase("default", DBARGS.Driver, DBARGS.Source, 20) + + BootStrap() + + truncateTables() + + dORM = NewOrm() +} + +func truncateTables() { + logs := "truncate tables for test\n" + o := NewOrm() + for _, m := range modelCache.allOrdered() { + query := fmt.Sprintf("truncate table `%s`", m.table) + _, err := o.Raw(query).Exec() + logs += query + "\n" + if err != nil { + fmt.Println(logs) + fmt.Println(err) + os.Exit(2) + } + } +} diff --git a/orm/orm.go b/orm/orm.go index 48237bbe..ddf8d8a9 100644 --- a/orm/orm.go +++ b/orm/orm.go @@ -9,13 +9,15 @@ import ( ) var ( - ErrTXHasBegin = errors.New(" transaction already begin") - ErrTXNotBegin = errors.New(" transaction not begin") - ErrMultiRows = errors.New(" return multi rows") - ErrStmtClosed = errors.New(" stmt already closed") DefaultRowsLimit = 1000 DefaultRelsDepth = 5 DefaultTimeLoc = time.Local + ErrTxHasBegan = errors.New(" transaction already begin") + ErrTxDone = errors.New(" transaction not begin") + ErrMultiRows = errors.New(" return multi rows") + ErrNoRows = errors.New(" not row found") + ErrStmtClosed = errors.New(" stmt already closed") + ErrNotImplement = errors.New("have not implement") ) type Params map[string]interface{} @@ -27,13 +29,15 @@ type orm struct { isTx bool } +var _ Ormer = new(orm) + func (o *orm) getMiInd(md Modeler) (mi *modelInfo, ind reflect.Value) { md.Init(md, true) name := md.GetTableName() if mi, ok := modelCache.get(name); ok { return mi, reflect.Indirect(reflect.ValueOf(md)) } - panic(fmt.Sprintf(" table name: `%s` not exists", name)) + panic(fmt.Sprintf(" table name: `%s` not exists", name)) } func (o *orm) Read(md Modeler) error { @@ -52,8 +56,8 @@ func (o *orm) Insert(md Modeler) (int64, error) { return id, err } if id > 0 { - if mi.fields.auto != nil { - ind.Field(mi.fields.auto.fieldIndex).SetInt(id) + if mi.fields.pk.auto { + ind.Field(mi.fields.pk.fieldIndex).SetInt(id) } } return id, nil @@ -75,13 +79,31 @@ func (o *orm) Delete(md Modeler) (int64, error) { return num, err } if num > 0 { - if mi.fields.auto != nil { - ind.Field(mi.fields.auto.fieldIndex).SetInt(0) + if mi.fields.pk.auto { + ind.Field(mi.fields.pk.fieldIndex).SetInt(0) } } return num, nil } +func (o *orm) M2mAdd(md Modeler, name string, mds ...interface{}) (int64, error) { + // TODO + panic(ErrNotImplement) + return 0, nil +} + +func (o *orm) M2mDel(md Modeler, name string, mds ...interface{}) (int64, error) { + // TODO + panic(ErrNotImplement) + return 0, nil +} + +func (o *orm) LoadRel(md Modeler, name string) (int64, error) { + // TODO + panic(ErrNotImplement) + return 0, nil +} + func (o *orm) QueryTable(ptrStructOrTableName interface{}) QuerySeter { name := "" if table, ok := ptrStructOrTableName.(string); ok { @@ -111,7 +133,7 @@ func (o *orm) Using(name string) error { func (o *orm) Begin() error { if o.isTx { - return ErrTXHasBegin + return ErrTxHasBegan } tx, err := o.alias.DB.Begin() if err != nil { @@ -124,24 +146,28 @@ func (o *orm) Begin() error { func (o *orm) Commit() error { if o.isTx == false { - return ErrTXNotBegin + return ErrTxDone } err := o.db.(*sql.Tx).Commit() if err == nil { o.isTx = false o.db = o.alias.DB + } else if err == sql.ErrTxDone { + return ErrTxDone } return err } func (o *orm) Rollback() error { if o.isTx == false { - return ErrTXNotBegin + return ErrTxDone } err := o.db.(*sql.Tx).Rollback() if err == nil { o.isTx = false o.db = o.alias.DB + } else if err == sql.ErrTxDone { + return ErrTxDone } return err } @@ -150,7 +176,13 @@ func (o *orm) Raw(query string, args ...interface{}) RawSeter { return newRawSet(o, query, args) } +func (o *orm) Driver() Driver { + return driver(o.alias.Name) +} + func NewOrm() Ormer { + BootStrap() // execute only once + o := new(orm) err := o.Using("default") if err != nil { diff --git a/orm/orm_conds.go b/orm/orm_conds.go index 43ba0f70..4a340f4b 100644 --- a/orm/orm_conds.go +++ b/orm/orm_conds.go @@ -26,23 +26,24 @@ func NewCondition() *Condition { return c } -func (c *Condition) And(expr string, args ...interface{}) *Condition { +func (c Condition) And(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(" args cannot empty") } c.params = append(c.params, condValue{exprs: strings.Split(expr, ExprSep), args: args}) - return c + return &c } -func (c *Condition) AndNot(expr string, args ...interface{}) *Condition { +func (c Condition) AndNot(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(" args cannot empty") } c.params = append(c.params, condValue{exprs: strings.Split(expr, ExprSep), args: args, isNot: true}) - return c + return &c } func (c *Condition) AndCond(cond *Condition) *Condition { + c = c.clone() if c == cond { panic("cannot use self as sub cond") } @@ -52,23 +53,24 @@ func (c *Condition) AndCond(cond *Condition) *Condition { return c } -func (c *Condition) Or(expr string, args ...interface{}) *Condition { +func (c Condition) Or(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(" args cannot empty") } c.params = append(c.params, condValue{exprs: strings.Split(expr, ExprSep), args: args, isOr: true}) - return c + return &c } -func (c *Condition) OrNot(expr string, args ...interface{}) *Condition { +func (c Condition) OrNot(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(" args cannot empty") } c.params = append(c.params, condValue{exprs: strings.Split(expr, ExprSep), args: args, isNot: true, isOr: true}) - return c + return &c } func (c *Condition) OrCond(cond *Condition) *Condition { + c = c.clone() if c == cond { panic("cannot use self as sub cond") } @@ -82,13 +84,6 @@ func (c *Condition) IsEmpty() bool { return len(c.params) == 0 } -func (c Condition) Clone() *Condition { - params := c.params - c.params = make([]condValue, len(params)) - copy(c.params, params) +func (c Condition) clone() *Condition { return &c } - -func (c *Condition) Merge() (expr string, args []interface{}) { - return expr, args -} diff --git a/orm/orm_object.go b/orm/orm_object.go index 288b2976..927ebbd7 100644 --- a/orm/orm_object.go +++ b/orm/orm_object.go @@ -13,6 +13,8 @@ type insertSet struct { closed bool } +var _ Inserter = new(insertSet) + func (o *insertSet) Insert(md Modeler) (int64, error) { if o.closed { return 0, ErrStmtClosed @@ -28,14 +30,17 @@ func (o *insertSet) Insert(md Modeler) (int64, error) { return id, err } if id > 0 { - if o.mi.fields.auto != nil { - ind.Field(o.mi.fields.auto.fieldIndex).SetInt(id) + if o.mi.fields.pk.auto { + ind.Field(o.mi.fields.pk.fieldIndex).SetInt(id) } } return id, nil } func (o *insertSet) Close() error { + if o.closed { + return ErrStmtClosed + } o.closed = true return o.stmt.Close() } diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index 2d78c312..92178a6c 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -15,47 +15,43 @@ type querySet struct { orm *orm } -func (o *querySet) Filter(expr string, args ...interface{}) QuerySeter { - o = o.clone() +var _ QuerySeter = new(querySet) + +func (o querySet) Filter(expr string, args ...interface{}) QuerySeter { if o.cond == nil { o.cond = NewCondition() } - o.cond.And(expr, args...) - return o + o.cond = o.cond.And(expr, args...) + return &o } -func (o *querySet) Exclude(expr string, args ...interface{}) QuerySeter { - o = o.clone() +func (o querySet) Exclude(expr string, args ...interface{}) QuerySeter { if o.cond == nil { o.cond = NewCondition() } - o.cond.AndNot(expr, args...) - return o + o.cond = o.cond.AndNot(expr, args...) + return &o } -func (o *querySet) Limit(limit int, args ...int64) QuerySeter { - o = o.clone() +func (o querySet) Limit(limit int, args ...int64) QuerySeter { o.limit = limit if len(args) > 0 { o.offset = args[0] } - return o + return &o } -func (o *querySet) Offset(offset int64) QuerySeter { - o = o.clone() +func (o querySet) Offset(offset int64) QuerySeter { o.offset = offset - return o + return &o } -func (o *querySet) OrderBy(exprs ...string) QuerySeter { - o = o.clone() +func (o querySet) OrderBy(exprs ...string) QuerySeter { o.orders = exprs - return o + return &o } -func (o *querySet) RelatedSel(params ...interface{}) QuerySeter { - o = o.clone() +func (o querySet) RelatedSel(params ...interface{}) QuerySeter { var related []string if len(params) == 0 { o.relDepth = DefaultRelsDepth @@ -72,13 +68,6 @@ func (o *querySet) RelatedSel(params ...interface{}) QuerySeter { } } o.related = related - return o -} - -func (o querySet) clone() *querySet { - if o.cond != nil { - o.cond = o.cond.Clone() - } return &o } @@ -115,6 +104,9 @@ func (o *querySet) One(container Modeler) error { if num > 1 { return ErrMultiRows } + if num == 0 { + return ErrNoRows + } return nil } diff --git a/orm/orm_raw.go b/orm/orm_raw.go index 3a5a488e..47c068fa 100644 --- a/orm/orm_raw.go +++ b/orm/orm_raw.go @@ -63,6 +63,8 @@ type rawSet struct { orm *orm } +var _ RawSeter = new(rawSet) + func (o rawSet) SetArgs(args ...interface{}) RawSeter { o.args = args return &o @@ -76,7 +78,12 @@ func (o *rawSet) Exec() (int64, error) { return getResult(res) } -func (o *rawSet) Mapper(...interface{}) (int64, error) { +func (o *rawSet) QueryRow(...interface{}) error { + //TODO + return nil +} + +func (o *rawSet) QueryRows(...interface{}) (int64, error) { //TODO return 0, nil } @@ -120,7 +127,7 @@ func (o *rawSet) readValues(container interface{}) (int64, error) { cols = columns refs = make([]interface{}, len(cols)) for i, _ := range refs { - var ref string + var ref sql.NullString refs[i] = &ref } } @@ -134,21 +141,21 @@ func (o *rawSet) readValues(container interface{}) (int64, error) { case 1: params := make(Params, len(cols)) for i, ref := range refs { - value := reflect.Indirect(reflect.ValueOf(ref)).Interface() - params[cols[i]] = value + value := reflect.Indirect(reflect.ValueOf(ref)).Interface().(sql.NullString) + params[cols[i]] = value.String } maps = append(maps, params) case 2: params := make(ParamsList, 0, len(cols)) for _, ref := range refs { - value := reflect.Indirect(reflect.ValueOf(ref)).Interface() - params = append(params, value) + value := reflect.Indirect(reflect.ValueOf(ref)).Interface().(sql.NullString) + params = append(params, value.String) } lists = append(lists, params) case 3: for _, ref := range refs { - value := reflect.Indirect(reflect.ValueOf(ref)).Interface() - list = append(list, value) + value := reflect.Indirect(reflect.ValueOf(ref)).Interface().(sql.NullString) + list = append(list, value.String) } } diff --git a/orm/orm_test.go b/orm/orm_test.go new file mode 100644 index 00000000..8c3768f6 --- /dev/null +++ b/orm/orm_test.go @@ -0,0 +1,688 @@ +package orm + +import ( + "bytes" + "fmt" + "io/ioutil" + "path/filepath" + "reflect" + "runtime" + "strings" + "testing" + "time" +) + +type T_Code int + +const ( + // = + T_Equal T_Code = iota + // < + T_Less + // > + T_Large + // elment in slice/array + // T_In + // key exists in map + // T_KeyExist + // index != -1 + // T_Contain + // index == 0 + // T_StartWith + // index == len(x) - 1 + // T_EndWith +) + +func ValuesCompare(is bool, a interface{}, o T_Code, args ...interface{}) (err error, ok bool) { + if len(args) == 0 { + return fmt.Errorf("miss args"), false + } + b := args[0] + arg := argAny(args) + switch o { + case T_Equal: + switch v := a.(type) { + case reflect.Kind: + ok = reflect.ValueOf(b).Kind() == v + case time.Time: + if v2, vo := b.(time.Time); vo { + if arg.Get(1) != nil { + format := ToStr(arg.Get(1)) + ok = v.Format(format) == v2.Format(format) + } else { + err = fmt.Errorf("compare datetime miss format") + goto wrongArg + } + } + default: + ok = ToStr(a) == ToStr(b) + } + ok = is && ok || !is && !ok + if !ok { + if is { + err = fmt.Errorf("should: a == b, a = `%v`, b = `%v`", a, b) + } else { + err = fmt.Errorf("should: a != b, a = `%v`, b = `%v`", a, b) + } + } + case T_Less, T_Large: + as := ToStr(a) + bs := ToStr(b) + f1, er := StrTo(as).Float64() + if er != nil { + err = fmt.Errorf("wrong type need numeric: `%v`", a) + goto wrongArg + } + f2, er := StrTo(bs).Float64() + if er != nil { + err = fmt.Errorf("wrong type need numeric: `%v`", b) + goto wrongArg + } + var opts []string + if o == T_Less { + opts = []string{"<", ">="} + ok = f1 < f2 + } else { + opts = []string{">", "<="} + ok = f1 > f2 + } + ok = is && ok || !is && !ok + if !ok { + if is { + err = fmt.Errorf("should: a %s b, a = `%v`, b = `%v`", opts[0], f1, f2) + } else { + err = fmt.Errorf("should: a %s b, a = `%v`, b = `%v`", opts[1], f1, f2) + } + } + } +wrongArg: + if err != nil { + return err, false + } + + return nil, true +} + +func AssertIs(a interface{}, o T_Code, args ...interface{}) error { + if err, ok := ValuesCompare(true, a, o, args...); ok == false { + return err + } + return nil +} + +func AssertNot(a interface{}, o T_Code, args ...interface{}) error { + if err, ok := ValuesCompare(false, a, o, args...); ok == false { + return err + } + return nil +} + +func getCaller(skip int) string { + pc, file, line, _ := runtime.Caller(skip) + fun := runtime.FuncForPC(pc) + _, fn := filepath.Split(file) + data, err := ioutil.ReadFile(file) + code := "" + if err == nil { + lines := bytes.Split(data, []byte{'\n'}) + code = strings.TrimSpace(string(lines[line-1])) + } + funName := fun.Name() + if i := strings.LastIndex(funName, "."); i > -1 { + funName = funName[i+1:] + } + return fmt.Sprintf("%s:%d: %s: %s", fn, line, funName, code) +} + +func throwFail(t *testing.T, err error, args ...interface{}) { + if err != nil { + params := []interface{}{"\n", getCaller(2), "\n", err, "\n"} + params = append(params, args...) + t.Error(params...) + t.Fail() + } +} + +func throwFailNow(t *testing.T, err error, args ...interface{}) { + if err != nil { + params := []interface{}{"\n", getCaller(2), "\n", err, "\n"} + params = append(params, args...) + t.Error(params...) + t.FailNow() + } +} + +func TestCRUD(t *testing.T) { + profile := NewProfile() + profile.Age = 30 + profile.Money = 1234.12 + id, err := dORM.Insert(profile) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + user := NewUser() + user.UserName = "slene" + user.Email = "vslene@gmail.com" + user.Password = "pass" + user.Status = 3 + user.IsStaff = true + user.IsActive = true + + id, err = dORM.Insert(user) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + u := &User{Id: user.Id} + err = dORM.Read(u) + throwFailNow(t, err) + + throwFailNow(t, AssertIs(u.UserName, T_Equal, "slene")) + throwFailNow(t, AssertIs(u.Email, T_Equal, "vslene@gmail.com")) + throwFailNow(t, AssertIs(u.Password, T_Equal, "pass")) + throwFailNow(t, AssertIs(u.Status, T_Equal, 3)) + throwFailNow(t, AssertIs(u.IsStaff, T_Equal, true)) + throwFailNow(t, AssertIs(u.IsActive, T_Equal, true)) + throwFailNow(t, AssertIs(u.Created, T_Equal, user.Created, format_Date)) + throwFailNow(t, AssertIs(u.Updated, T_Equal, user.Updated, format_DateTime)) + + user.UserName = "astaxie" + user.Profile = profile + num, err := dORM.Update(user) + throwFailNow(t, err) + throwFailNow(t, AssertIs(num, T_Equal, 1)) + + u = &User{Id: user.Id} + err = dORM.Read(u) + throwFailNow(t, err) + + throwFailNow(t, AssertIs(u.UserName, T_Equal, "astaxie")) + throwFailNow(t, AssertIs(u.Profile.Id, T_Equal, profile.Id)) + + num, err = dORM.Delete(profile) + throwFailNow(t, err) + throwFailNow(t, AssertIs(num, T_Equal, 1)) + + u = &User{Id: user.Id} + err = dORM.Read(u) + throwFailNow(t, err) + throwFailNow(t, AssertIs(true, T_Equal, u.Profile == nil)) + + num, err = dORM.Delete(user) + throwFailNow(t, err) + throwFailNow(t, AssertIs(num, T_Equal, 1)) + + u = &User{Id: 100} + err = dORM.Read(u) + throwFailNow(t, AssertIs(err, T_Equal, ErrNoRows)) +} + +func TestInsertTestData(t *testing.T) { + var users []*User + + profile := NewProfile() + profile.Age = 28 + profile.Money = 1234.12 + + id, err := dORM.Insert(profile) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + user := NewUser() + user.UserName = "slene" + user.Email = "vslene@gmail.com" + user.Password = "pass" + user.Status = 1 + user.IsStaff = false + user.IsActive = true + user.Profile = profile + + users = append(users, user) + + id, err = dORM.Insert(user) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + profile = NewProfile() + profile.Age = 30 + profile.Money = 4321.09 + + id, err = dORM.Insert(profile) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + user = NewUser() + user.UserName = "astaxie" + user.Email = "astaxie@gmail.com" + user.Password = "password" + user.Status = 2 + user.IsStaff = true + user.IsActive = false + user.Profile = profile + + users = append(users, user) + + id, err = dORM.Insert(user) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + user = NewUser() + user.UserName = "nobody" + user.Email = "nobody@gmail.com" + user.Password = "nobody" + user.Status = 3 + user.IsStaff = false + user.IsActive = false + + users = append(users, user) + + id, err = dORM.Insert(user) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + + tags := []*Tag{ + &Tag{Name: "golang"}, + &Tag{Name: "example"}, + &Tag{Name: "format"}, + &Tag{Name: "c++"}, + } + + posts := []*Post{ + &Post{User: users[0], Tags: []*Tag{tags[0]}, Title: "Introduction", Content: `Go is a new language. Although it borrows ideas from existing languages, it has unusual properties that make effective Go programs different in character from programs written in its relatives. A straightforward translation of a C++ or Java program into Go is unlikely to produce a satisfactory result—Java programs are written in Java, not Go. On the other hand, thinking about the problem from a Go perspective could produce a successful but quite different program. In other words, to write Go well, it's important to understand its properties and idioms. It's also important to know the established conventions for programming in Go, such as naming, formatting, program construction, and so on, so that programs you write will be easy for other Go programmers to understand. +This document gives tips for writing clear, idiomatic Go code. It augments the language specification, the Tour of Go, and How to Write Go Code, all of which you should read first.`}, + &Post{User: users[1], Tags: []*Tag{tags[0], tags[1]}, Title: "Examples", Content: `The Go package sources are intended to serve not only as the core library but also as examples of how to use the language. Moreover, many of the packages contain working, self-contained executable examples you can run directly from the golang.org web site, such as this one (click on the word "Example" to open it up). If you have a question about how to approach a problem or how something might be implemented, the documentation, code and examples in the library can provide answers, ideas and background.`}, + &Post{User: users[1], Tags: []*Tag{tags[0], tags[2]}, Title: "Formatting", Content: `Formatting issues are the most contentious but the least consequential. People can adapt to different formatting styles but it's better if they don't have to, and less time is devoted to the topic if everyone adheres to the same style. The problem is how to approach this Utopia without a long prescriptive style guide. +With Go we take an unusual approach and let the machine take care of most formatting issues. The gofmt program (also available as go fmt, which operates at the package level rather than source file level) reads a Go program and emits the source in a standard style of indentation and vertical alignment, retaining and if necessary reformatting comments. If you want to know how to handle some new layout situation, run gofmt; if the answer doesn't seem right, rearrange your program (or file a bug about gofmt), don't work around it.`}, + &Post{User: users[2], Tags: []*Tag{tags[3]}, Title: "Commentary", Content: `Go provides C-style /* */ block comments and C++-style // line comments. Line comments are the norm; block comments appear mostly as package comments, but are useful within an expression or to disable large swaths of code. +The program—and web server—godoc processes Go source files to extract documentation about the contents of the package. Comments that appear before top-level declarations, with no intervening newlines, are extracted along with the declaration to serve as explanatory text for the item. The nature and style of these comments determines the quality of the documentation godoc produces.`}, + } + + comments := []*Comment{ + &Comment{Post: posts[0], Content: "a comment"}, + &Comment{Post: posts[1], Content: "yes"}, + &Comment{Post: posts[1]}, + &Comment{Post: posts[1]}, + &Comment{Post: posts[2]}, + &Comment{Post: posts[2]}, + } + + for _, tag := range tags { + id, err := dORM.Insert(tag) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + } + + for _, post := range posts { + id, err := dORM.Insert(post) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + // dORM.M2mAdd(post, "tags", post.Tags) + } + + for _, comment := range comments { + id, err := dORM.Insert(comment) + throwFailNow(t, err) + throwFailNow(t, AssertIs(id, T_Large, 0)) + } +} + +func TestExpr(t *testing.T) { + qs := dORM.QueryTable("User") + qs = dORM.QueryTable("user") + num, err := qs.Filter("UserName", "slene").Filter("user_name", "slene").Filter("profile__Age", 28).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) +} + +func TestOperators(t *testing.T) { + qs := dORM.QueryTable("user") + num, err := qs.Filter("user_name", "slene").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("user_name__exact", "slene").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("user_name__iexact", "Slene").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("user_name__contains", "e").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("user_name__contains", "E").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 0)) + + num, err = qs.Filter("user_name__icontains", "E").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("user_name__icontains", "E").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("status__gt", 1).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("status__gte", 1).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + + num, err = qs.Filter("status__lt", 3).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("status__lte", 3).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + + num, err = qs.Filter("user_name__startswith", "s").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("user_name__startswith", "S").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 0)) + + num, err = qs.Filter("user_name__istartswith", "S").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("user_name__endswith", "e").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("user_name__endswith", "E").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 0)) + + num, err = qs.Filter("user_name__iendswith", "E").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Filter("profile__isnull", true).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("status__in", 1, 2).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) +} + +func TestAll(t *testing.T) { + var users []*User + qs := dORM.QueryTable("user") + num, err := qs.All(&users) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + + qs = dORM.QueryTable("user") + num, err = qs.Filter("user_name", "nothing").All(&users) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 0)) +} + +func TestOne(t *testing.T) { + var user User + qs := dORM.QueryTable("user") + err := qs.One(&user) + throwFail(t, AssertIs(err, T_Equal, ErrMultiRows)) + + err = qs.Filter("user_name", "nothing").One(&user) + throwFail(t, AssertIs(err, T_Equal, ErrNoRows)) +} + +func TestValues(t *testing.T) { + var maps []Params + qs := dORM.QueryTable("user") + + num, err := qs.Values(&maps) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + if num == 3 { + throwFail(t, AssertIs(maps[0]["UserName"], T_Equal, "slene")) + throwFail(t, AssertIs(maps[2]["Profile"], T_Equal, nil)) + } + + num, err = qs.Values(&maps, "UserName", "Profile__Age") + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + if num == 3 { + throwFail(t, AssertIs(maps[0]["UserName"], T_Equal, "slene")) + throwFail(t, AssertIs(maps[0]["Profile__Age"], T_Equal, 28)) + throwFail(t, AssertIs(maps[2]["Profile__Age"], T_Equal, nil)) + } +} + +func TestValuesList(t *testing.T) { + var list []ParamsList + qs := dORM.QueryTable("user") + + num, err := qs.ValuesList(&list) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + if num == 3 { + throwFail(t, AssertIs(list[0][1], T_Equal, "slene")) + throwFail(t, AssertIs(list[2][9], T_Equal, nil)) + } + + num, err = qs.ValuesList(&list, "UserName", "Profile__Age") + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + if num == 3 { + throwFail(t, AssertIs(list[0][0], T_Equal, "slene")) + throwFail(t, AssertIs(list[0][1], T_Equal, 28)) + throwFail(t, AssertIs(list[2][1], T_Equal, nil)) + } +} + +func TestValuesFlat(t *testing.T) { + var list ParamsList + qs := dORM.QueryTable("user") + + num, err := qs.OrderBy("id").ValuesFlat(&list, "UserName") + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + if num == 3 { + throwFail(t, AssertIs(list[0], T_Equal, "slene")) + throwFail(t, AssertIs(list[1], T_Equal, "astaxie")) + throwFail(t, AssertIs(list[2], T_Equal, "nobody")) + } +} + +func TestRelatedSel(t *testing.T) { + qs := dORM.QueryTable("user") + num, err := qs.Filter("profile__age", 28).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("profile__age__gt", 28).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Filter("profile__user__profile__age__gt", 28).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + var user User + err = qs.Filter("user_name", "slene").RelatedSel("profile").One(&user) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + throwFail(t, AssertNot(user.Profile, T_Equal, nil)) + if user.Profile != nil { + throwFail(t, AssertIs(user.Profile.Age, T_Equal, 28)) + } + + err = qs.Filter("user_name", "slene").RelatedSel().One(&user) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + throwFail(t, AssertNot(user.Profile, T_Equal, nil)) + throwFail(t, AssertIs(user.Profile.Age, T_Equal, 28)) + if user.Profile != nil { + throwFail(t, AssertIs(user.Profile.Age, T_Equal, 28)) + } + + err = qs.Filter("user_name", "nobody").RelatedSel("profile").One(&user) + throwFail(t, AssertIs(num, T_Equal, 1)) + throwFail(t, AssertIs(user.Profile, T_Equal, nil)) + + qs = dORM.QueryTable("user_profile") + num, err = qs.Filter("user__username", "slene").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) +} + +func TestSetCond(t *testing.T) { + cond := NewCondition() + cond1 := cond.And("profile__isnull", false).AndNot("status__in", 1).Or("profile__age__gt", 2000) + + qs := dORM.QueryTable("user") + num, err := qs.SetCond(cond1).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + cond2 := cond.AndCond(cond1).OrCond(cond.And("user_name", "slene")) + num, err = qs.SetCond(cond2).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) +} + +func TestLimit(t *testing.T) { + var posts []*Post + qs := dORM.QueryTable("post") + num, err := qs.Limit(1).All(&posts) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Limit(-1).All(&posts) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 4)) + + num, err = qs.Limit(-1, 2).All(&posts) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + num, err = qs.Limit(0, 2).All(&posts) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) +} + +func TestOffset(t *testing.T) { + var posts []*Post + qs := dORM.QueryTable("post") + num, err := qs.Limit(1).Offset(2).All(&posts) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.Offset(2).All(&posts) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) +} + +func TestOrderBy(t *testing.T) { + qs := dORM.QueryTable("user") + num, err := qs.OrderBy("-status").Filter("user_name", "nobody").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.OrderBy("status").Filter("user_name", "slene").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = qs.OrderBy("-profile__age").Filter("user_name", "astaxie").Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) +} + +func TestPrepareInsert(t *testing.T) { + qs := dORM.QueryTable("user") + i, err := qs.PrepareInsert() + throwFail(t, err) + + var user User + user.UserName = "testing1" + num, err := i.Insert(&user) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Large, 0)) + + user.UserName = "testing2" + num, err = i.Insert(&user) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Large, 0)) + + num, err = qs.Filter("user_name__in", "testing1", "testing2").Delete() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 2)) + + err = i.Close() + throwFail(t, err) + err = i.Close() + throwFail(t, AssertIs(err, T_Equal, ErrStmtClosed)) +} + +func TestRaw(t *testing.T) { + switch dORM.Driver().Type() { + case DR_MySQL: + num, err := dORM.Raw("UPDATE user SET user_name = ? WHERE user_name = ?", "testing", "slene").Exec() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + num, err = dORM.Raw("UPDATE user SET user_name = ? WHERE user_name = ?", "slene", "testing").Exec() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + var maps []Params + num, err = dORM.Raw("SELECT user_name FROM user WHERE status = ?", 1).Values(&maps) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + if num == 1 { + throwFail(t, AssertIs(maps[0]["user_name"], T_Equal, "slene")) + } + + var lists []ParamsList + num, err = dORM.Raw("SELECT user_name FROM user WHERE status = ?", 1).ValuesList(&lists) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + if num == 1 { + throwFail(t, AssertIs(lists[0][0], T_Equal, "slene")) + } + + var list ParamsList + num, err = dORM.Raw("SELECT profile_id FROM user ORDER BY id ASC").ValuesFlat(&list) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 3)) + if num == 3 { + throwFail(t, AssertIs(list[0], T_Equal, "2")) + throwFail(t, AssertIs(list[1], T_Equal, "3")) + throwFail(t, AssertIs(list[2], T_Equal, "")) + } + } +} + +func TestUpdate(t *testing.T) { + qs := dORM.QueryTable("user") + num, err := qs.Filter("user_name", "slene").Update(Params{ + "is_staff": true, + }) + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) +} + +func TestDelete(t *testing.T) { + qs := dORM.QueryTable("user_profile") + num, err := qs.Filter("user__user_name", "slene").Delete() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) + + qs = dORM.QueryTable("user") + num, err = qs.Filter("user_name", "slene").Filter("profile__isnull", true).Count() + throwFail(t, err) + throwFail(t, AssertIs(num, T_Equal, 1)) +} + +func TestTransaction(t *testing.T) { + +} diff --git a/orm/types.go b/orm/types.go index d6a75788..7fda4488 100644 --- a/orm/types.go +++ b/orm/types.go @@ -5,6 +5,11 @@ import ( "reflect" ) +type Driver interface { + Name() string + Type() DriverType +} + type Fielder interface { String() string FieldType() int @@ -26,12 +31,16 @@ type Ormer interface { Insert(Modeler) (int64, error) Update(Modeler) (int64, error) Delete(Modeler) (int64, error) + M2mAdd(Modeler, string, ...interface{}) (int64, error) + M2mDel(Modeler, string, ...interface{}) (int64, error) + LoadRel(Modeler, string) (int64, error) QueryTable(interface{}) QuerySeter Using(string) error Begin() error Commit() error Rollback() error Raw(string, ...interface{}) RawSeter + Driver() Driver } type Inserter interface { @@ -42,16 +51,15 @@ type Inserter interface { type QuerySeter interface { Filter(string, ...interface{}) QuerySeter Exclude(string, ...interface{}) QuerySeter + SetCond(*Condition) QuerySeter Limit(int, ...int64) QuerySeter Offset(int64) QuerySeter OrderBy(...string) QuerySeter RelatedSel(...interface{}) QuerySeter - SetCond(*Condition) QuerySeter Count() (int64, error) Update(Params) (int64, error) Delete() (int64, error) PrepareInsert() (Inserter, error) - All(interface{}) (int64, error) One(Modeler) error Values(*[]Params, ...string) (int64, error) @@ -60,12 +68,15 @@ type QuerySeter interface { } type RawPreparer interface { + Exec(...interface{}) (int64, error) Close() error } type RawSeter interface { Exec() (int64, error) - Mapper(...interface{}) (int64, error) + QueryRow(...interface{}) error + QueryRows(...interface{}) (int64, error) + SetArgs(...interface{}) RawSeter Values(*[]Params) (int64, error) ValuesList(*[]ParamsList) (int64, error) ValuesFlat(*ParamsList) (int64, error) diff --git a/orm/utils.go b/orm/utils.go index 7dd54896..7f6373a4 100644 --- a/orm/utils.go +++ b/orm/utils.go @@ -171,6 +171,18 @@ func (a argInt) Get(i int, args ...int) (r int) { return } +type argAny []interface{} + +func (a argAny) Get(i int, args ...interface{}) (r interface{}) { + if i >= 0 && i < len(a) { + r = a[i] + } + if len(args) > 0 { + r = args[0] + } + return +} + func timeParse(dateString, format string) (time.Time, error) { tp, err := time.ParseInLocation(format, dateString, DefaultTimeLoc) return tp, err