diff --git a/doc.go b/doc.go index bf412bda..a687e694 100644 --- a/doc.go +++ b/doc.go @@ -90,7 +90,7 @@ another is Rows 5. Update one or more records - affected, err := engine.Id(...).Update(&user) + affected, err := engine.ID(...).Update(&user) // UPDATE user SET ... 6. Delete one or more records, Delete MUST has condition diff --git a/examples/cache.go b/examples/cache.go index 72d987df..0c680d23 100644 --- a/examples/cache.go +++ b/examples/cache.go @@ -67,7 +67,7 @@ func main() { fmt.Println("users3:", users3) user4 := new(User) - has, err := Orm.Id(1).Get(user4) + has, err := Orm.ID(1).Get(user4) if err != nil { fmt.Println(err) return @@ -76,7 +76,7 @@ func main() { fmt.Println("user4:", has, user4) user4.Name = "xiaolunwen" - _, err = Orm.Id(1).Update(user4) + _, err = Orm.ID(1).Update(user4) if err != nil { fmt.Println(err) return @@ -84,14 +84,14 @@ func main() { fmt.Println("user4:", user4) user5 := new(User) - has, err = Orm.Id(1).Get(user5) + has, err = Orm.ID(1).Get(user5) if err != nil { fmt.Println(err) return } fmt.Println("user5:", has, user5) - _, err = Orm.Id(1).Delete(new(User)) + _, err = Orm.ID(1).Delete(new(User)) if err != nil { fmt.Println(err) return @@ -99,7 +99,7 @@ func main() { for { user6 := new(User) - has, err = Orm.Id(1).Get(user6) + has, err = Orm.ID(1).Get(user6) if err != nil { fmt.Println(err) return diff --git a/examples/cachegoroutine.go b/examples/cachegoroutine.go index 815e0ad1..e5b2b9d7 100644 --- a/examples/cachegoroutine.go +++ b/examples/cachegoroutine.go @@ -55,7 +55,7 @@ func test(engine *xorm.Engine) { } else if x+j < 16 { _, err = engine.Insert(&User{Name: "xlw"}) } else if x+j < 32 { - //_, err = engine.Id(1).Delete(u) + //_, err = engine.ID(1).Delete(u) _, err = engine.Delete(u) } if err != nil { diff --git a/examples/derive.go b/examples/derive.go index 86529eea..90561514 100644 --- a/examples/derive.go +++ b/examples/derive.go @@ -51,7 +51,7 @@ func main() { } info := LoginInfo{} - _, err = orm.Id(1).Get(&info) + _, err = orm.ID(1).Get(&info) if err != nil { fmt.Println(err) return diff --git a/examples/goroutine.go b/examples/goroutine.go index 629ea9ac..59e56d10 100644 --- a/examples/goroutine.go +++ b/examples/goroutine.go @@ -59,7 +59,7 @@ func test(engine *xorm.Engine) { } else if x+j < 16 { _, err = engine.Insert(&User{Name: "xlw"}) } else if x+j < 32 { - _, err = engine.Id(1).Delete(u) + _, err = engine.ID(1).Delete(u) } if err != nil { fmt.Println(err) diff --git a/examples/maxconnect.go b/examples/maxconnect.go index 507cbc3c..72d0a503 100644 --- a/examples/maxconnect.go +++ b/examples/maxconnect.go @@ -62,7 +62,7 @@ func test(engine *xorm.Engine) { } else if x+j < 16 { _, err = engine.Insert(&User{Name: "xlw"}) } else if x+j < 32 { - _, err = engine.Id(1).Delete(u) + _, err = engine.ID(1).Delete(u) } if err != nil { fmt.Println(err) diff --git a/examples/singlemapping.go b/examples/singlemapping.go index 3ae0fd1a..86e5d1d7 100644 --- a/examples/singlemapping.go +++ b/examples/singlemapping.go @@ -48,7 +48,7 @@ func main() { } info := LoginInfo{} - _, err = orm.Id(1).Get(&info) + _, err = orm.ID(1).Get(&info) if err != nil { fmt.Println(err) return diff --git a/processors_test.go b/processors_test.go index 6c22af0a..5fc2170d 100644 --- a/processors_test.go +++ b/processors_test.go @@ -173,7 +173,7 @@ func TestProcessors(t *testing.T) { } p2 := &ProcessorsStruct{} - _, err = testEngine.Id(p.Id).Get(p2) + _, err = testEngine.ID(p.Id).Get(p2) if err != nil { t.Error(err) panic(err) @@ -308,7 +308,7 @@ func TestProcessors(t *testing.T) { } p2 = &ProcessorsStruct{} - _, err = testEngine.Id(p.Id).Get(p2) + _, err = testEngine.ID(p.Id).Get(p2) if err != nil { t.Error(err) panic(err) @@ -402,7 +402,7 @@ func TestProcessors(t *testing.T) { for _, elem := range pslice { p = &ProcessorsStruct{} - _, err = testEngine.Id(elem.Id).Get(p) + _, err = testEngine.ID(elem.Id).Get(p) if err != nil { t.Error(err) panic(err) @@ -508,7 +508,7 @@ func TestProcessorsTx(t *testing.T) { } session.Close() p2 := &ProcessorsStruct{} - _, err = testEngine.Id(p.Id).Get(p2) + _, err = testEngine.ID(p.Id).Get(p2) if err != nil { t.Error(err) panic(err) @@ -569,7 +569,7 @@ func TestProcessorsTx(t *testing.T) { } session.Close() p2 = &ProcessorsStruct{} - _, err = testEngine.Id(p.Id).Get(p2) + _, err = testEngine.ID(p.Id).Get(p2) if err != nil { t.Error(err) panic(err) @@ -616,7 +616,7 @@ func TestProcessorsTx(t *testing.T) { p = p2 // reset - _, err = session.Id(insertedId).Before(b4UpdateFunc).After(afterUpdateFunc).Update(p) + _, err = session.ID(insertedId).Before(b4UpdateFunc).After(afterUpdateFunc).Update(p) if err != nil { t.Error(err) panic(err) @@ -656,7 +656,7 @@ func TestProcessorsTx(t *testing.T) { session.Close() p2 = &ProcessorsStruct{} - _, err = testEngine.Id(insertedId).Get(p2) + _, err = testEngine.ID(insertedId).Get(p2) if err != nil { t.Error(err) panic(err) @@ -729,7 +729,7 @@ func TestProcessorsTx(t *testing.T) { p = &ProcessorsStruct{} - _, err = session.Id(insertedId).Before(b4UpdateFunc).After(afterUpdateFunc).Update(p) + _, err = session.ID(insertedId).Before(b4UpdateFunc).After(afterUpdateFunc).Update(p) if err != nil { t.Error(err) panic(err) @@ -767,7 +767,7 @@ func TestProcessorsTx(t *testing.T) { } session.Close() p2 = &ProcessorsStruct{} - _, err = testEngine.Id(insertedId).Get(p2) + _, err = testEngine.ID(insertedId).Get(p2) if err != nil { t.Error(err) panic(err) @@ -813,7 +813,7 @@ func TestProcessorsTx(t *testing.T) { p = &ProcessorsStruct{} // reset - _, err = session.Id(insertedId).Before(b4DeleteFunc).After(afterDeleteFunc).Delete(p) + _, err = session.ID(insertedId).Before(b4DeleteFunc).After(afterDeleteFunc).Delete(p) if err != nil { t.Error(err) panic(err) @@ -852,7 +852,7 @@ func TestProcessorsTx(t *testing.T) { session.Close() p2 = &ProcessorsStruct{} - _, err = testEngine.Id(insertedId).Get(p2) + _, err = testEngine.ID(insertedId).Get(p2) if err != nil { t.Error(err) panic(err) @@ -882,7 +882,7 @@ func TestProcessorsTx(t *testing.T) { p = &ProcessorsStruct{} - _, err = session.Id(insertedId).Before(b4DeleteFunc).After(afterDeleteFunc).Delete(p) + _, err = session.ID(insertedId).Before(b4DeleteFunc).After(afterDeleteFunc).Delete(p) if err != nil { t.Error(err) panic(err) diff --git a/session.go b/session.go index 6f7aca32..8a8d5af6 100644 --- a/session.go +++ b/session.go @@ -631,9 +631,7 @@ func (session *Session) slice2Bean(scanResults []interface{}, fields []string, f // however, also need to consider adding a 'lazy' attribute to xorm tag which allow hasOne // property to be fetched lazily structInter := reflect.New(fieldValue.Type()) - newsession := session.engine.NewSession() - defer newsession.Close() - has, err := newsession.ID(pk).NoCascade().Get(structInter.Interface()) + has, err := session.ID(pk).NoCascade().get(structInter.Interface()) if err != nil { return nil, err } diff --git a/session_cols_test.go b/session_cols_test.go index f742a86a..2a292bd3 100644 --- a/session_cols_test.go +++ b/session_cols_test.go @@ -31,7 +31,7 @@ func TestSetExpr(t *testing.T) { if testEngine.dialect.DBType() == core.MSSQL { not = "~" } - cnt, err = testEngine.SetExpr("show", not+" `show`").Id(1).Update(new(User)) + cnt, err = testEngine.SetExpr("show", not+" `show`").ID(1).Update(new(User)) assert.NoError(t, err) assert.EqualValues(t, 1, cnt) } diff --git a/session_cond_test.go b/session_cond_test.go index e144a0a3..5f8716f0 100644 --- a/session_cond_test.go +++ b/session_cond_test.go @@ -227,7 +227,7 @@ func TestIn(t *testing.T) { } user := new(Userinfo) - has, err := testEngine.Id(ids[0]).Get(user) + has, err := testEngine.ID(ids[0]).Get(user) if err != nil { t.Error(err) panic(err) diff --git a/session_convert.go b/session_convert.go index 85002d27..fc244e60 100644 --- a/session_convert.go +++ b/session_convert.go @@ -227,9 +227,7 @@ func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value, // however, also need to consider adding a 'lazy' attribute to xorm tag which allow hasOne // property to be fetched lazily structInter := reflect.New(fieldValue.Type()) - newsession := session.engine.NewSession() - defer newsession.Close() - has, err := newsession.Id(pk).NoCascade().Get(structInter.Interface()) + has, err := session.ID(pk).NoCascade().get(structInter.Interface()) if err != nil { return err } @@ -510,9 +508,7 @@ func (session *Session) bytes2Value(col *core.Column, fieldValue *reflect.Value, // !nashtsai! TODO for hasOne relationship, it's preferred to use join query for eager fetch // however, also need to consider adding a 'lazy' attribute to xorm tag which allow hasOne // property to be fetched lazily - newsession := session.engine.NewSession() - defer newsession.Close() - has, err := newsession.Id(pk).NoCascade().Get(structInter.Interface()) + has, err := session.ID(pk).NoCascade().get(structInter.Interface()) if err != nil { return err } diff --git a/session_delete_test.go b/session_delete_test.go index ad817bd1..7eddd4cd 100644 --- a/session_delete_test.go +++ b/session_delete_test.go @@ -32,7 +32,7 @@ func TestDelete(t *testing.T) { user.Uid = 0 user.IsMan = true - has, err := testEngine.Id(1).Get(&user) + has, err := testEngine.ID(1).Get(&user) assert.NoError(t, err) assert.False(t, has) @@ -46,7 +46,7 @@ func TestDelete(t *testing.T) { user.Uid = 0 user.IsMan = true - has, err = testEngine.Id(2).Get(&user) + has, err = testEngine.ID(2).Get(&user) assert.NoError(t, err) assert.False(t, has) } @@ -82,16 +82,16 @@ func TestDeleted(t *testing.T) { // Test normal Get() record1 := &Deleted{} - has, err := testEngine.Id(1).Get(record1) + has, err := testEngine.ID(1).Get(record1) assert.NoError(t, err) assert.True(t, has) // Test Delete() with deleted - affected, err := testEngine.Id(1).Delete(&Deleted{}) + affected, err := testEngine.ID(1).Delete(&Deleted{}) assert.NoError(t, err) assert.EqualValues(t, 1, affected) - has, err = testEngine.Id(1).Get(&Deleted{}) + has, err = testEngine.ID(1).Get(&Deleted{}) assert.NoError(t, err) assert.False(t, has) @@ -101,17 +101,17 @@ func TestDeleted(t *testing.T) { assert.EqualValues(t, 2, len(records2)) // Test no rows affected after Delete() again. - affected, err = testEngine.Id(1).Delete(&Deleted{}) + affected, err = testEngine.ID(1).Delete(&Deleted{}) assert.NoError(t, err) assert.EqualValues(t, 0, affected) // Deleted.DeletedAt must not be updated. - affected, err = testEngine.Id(2).Update(&Deleted{Name: "2", DeletedAt: time.Now()}) + affected, err = testEngine.ID(2).Update(&Deleted{Name: "2", DeletedAt: time.Now()}) assert.NoError(t, err) assert.EqualValues(t, 1, affected) record2 := &Deleted{} - has, err = testEngine.Id(2).Get(record2) + has, err = testEngine.ID(2).Get(record2) assert.NoError(t, err) assert.True(t, record2.DeletedAt.IsZero()) @@ -122,7 +122,7 @@ func TestDeleted(t *testing.T) { assert.EqualValues(t, 3, len(unscopedRecords1)) // Delete() must really delete a record with Unscoped() - affected, err = testEngine.Unscoped().Id(1).Delete(&Deleted{}) + affected, err = testEngine.Unscoped().ID(1).Delete(&Deleted{}) assert.NoError(t, err) assert.EqualValues(t, 1, affected) diff --git a/session_get.go b/session_get.go index a697ec5e..4d33a201 100644 --- a/session_get.go +++ b/session_get.go @@ -18,7 +18,10 @@ func (session *Session) Get(bean interface{}) (bool, error) { if session.isAutoClose { defer session.Close() } + return session.get(bean) +} +func (session *Session) get(bean interface{}) (bool, error) { beanValue := reflect.ValueOf(bean) if beanValue.Kind() != reflect.Ptr { return false, errors.New("needs a pointer to a value") diff --git a/session_pk_test.go b/session_pk_test.go index 0e17352c..c919cd4f 100644 --- a/session_pk_test.go +++ b/session_pk_test.go @@ -127,7 +127,7 @@ func TestIntId(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&IntId{}) + cnt, err = testEngine.ID(bean.Id).Delete(&IntId{}) if err != nil { t.Error(err) panic(err) @@ -202,7 +202,7 @@ func TestInt16Id(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&Int16Id{}) + cnt, err = testEngine.ID(bean.Id).Delete(&Int16Id{}) if err != nil { t.Error(err) panic(err) @@ -277,7 +277,7 @@ func TestInt32Id(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&Int32Id{}) + cnt, err = testEngine.ID(bean.Id).Delete(&Int32Id{}) if err != nil { t.Error(err) panic(err) @@ -366,7 +366,7 @@ func TestUintId(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&UintId{}) + cnt, err = testEngine.ID(bean.Id).Delete(&UintId{}) if err != nil { t.Error(err) panic(err) @@ -441,7 +441,7 @@ func TestUint16Id(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&Uint16Id{}) + cnt, err = testEngine.ID(bean.Id).Delete(&Uint16Id{}) if err != nil { t.Error(err) panic(err) @@ -516,7 +516,7 @@ func TestUint32Id(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&Uint32Id{}) + cnt, err = testEngine.ID(bean.Id).Delete(&Uint32Id{}) if err != nil { t.Error(err) panic(err) @@ -604,7 +604,7 @@ func TestUint64Id(t *testing.T) { panic(errors.New("should be equal")) } - cnt, err = testEngine.Id(bean.Id).Delete(&Uint64Id{}) + cnt, err = testEngine.ID(bean.Id).Delete(&Uint64Id{}) if err != nil { t.Error(err) panic(err) @@ -679,7 +679,7 @@ func TestStringPK(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(bean.Id).Delete(&StringPK{}) + cnt, err = testEngine.ID(bean.Id).Delete(&StringPK{}) if err != nil { t.Error(err) panic(err) @@ -725,7 +725,7 @@ func TestCompositeKey(t *testing.T) { } var compositeKeyVal CompositeKey - has, err := testEngine.Id(core.PK{11, 22}).Get(&compositeKeyVal) + has, err := testEngine.ID(core.PK{11, 22}).Get(&compositeKeyVal) if err != nil { t.Error(err) } else if !has { @@ -734,7 +734,7 @@ func TestCompositeKey(t *testing.T) { var compositeKeyVal2 CompositeKey // test passing PK ptr, this test seem failed withCache - has, err = testEngine.Id(&core.PK{11, 22}).Get(&compositeKeyVal2) + has, err = testEngine.ID(&core.PK{11, 22}).Get(&compositeKeyVal2) if err != nil { t.Error(err) } else if !has { @@ -781,14 +781,14 @@ func TestCompositeKey(t *testing.T) { } compositeKeyVal = CompositeKey{UpdateStr: "test1"} - cnt, err = testEngine.Id(core.PK{11, 22}).Update(&compositeKeyVal) + cnt, err = testEngine.ID(core.PK{11, 22}).Update(&compositeKeyVal) if err != nil { t.Error(err) } else if cnt != 1 { t.Error(errors.New("can't update CompositeKey{11, 22}")) } - cnt, err = testEngine.Id(core.PK{11, 22}).Delete(&CompositeKey{}) + cnt, err = testEngine.ID(core.PK{11, 22}).Delete(&CompositeKey{}) if err != nil { t.Error(err) } else if cnt != 1 { @@ -832,7 +832,7 @@ func TestCompositeKey2(t *testing.T) { } var user User - has, err := testEngine.Id(core.PK{"11", 22}).Get(&user) + has, err := testEngine.ID(core.PK{"11", 22}).Get(&user) if err != nil { t.Error(err) } else if !has { @@ -840,7 +840,7 @@ func TestCompositeKey2(t *testing.T) { } // test passing PK ptr, this test seem failed withCache - has, err = testEngine.Id(&core.PK{"11", 22}).Get(&user) + has, err = testEngine.ID(&core.PK{"11", 22}).Get(&user) if err != nil { t.Error(err) } else if !has { @@ -848,14 +848,14 @@ func TestCompositeKey2(t *testing.T) { } user = User{NickName: "test1"} - cnt, err = testEngine.Id(core.PK{"11", 22}).Update(&user) + cnt, err = testEngine.ID(core.PK{"11", 22}).Update(&user) if err != nil { t.Error(err) } else if cnt != 1 { t.Error(errors.New("can't update User{11, 22}")) } - cnt, err = testEngine.Id(core.PK{"11", 22}).Delete(&User{}) + cnt, err = testEngine.ID(core.PK{"11", 22}).Delete(&User{}) if err != nil { t.Error(err) } else if cnt != 1 { @@ -900,7 +900,7 @@ func TestCompositeKey3(t *testing.T) { } var user UserPK2 - has, err := testEngine.Id(core.PK{"11", 22}).Get(&user) + has, err := testEngine.ID(core.PK{"11", 22}).Get(&user) if err != nil { t.Error(err) } else if !has { @@ -908,7 +908,7 @@ func TestCompositeKey3(t *testing.T) { } // test passing PK ptr, this test seem failed withCache - has, err = testEngine.Id(&core.PK{"11", 22}).Get(&user) + has, err = testEngine.ID(&core.PK{"11", 22}).Get(&user) if err != nil { t.Error(err) } else if !has { @@ -916,14 +916,14 @@ func TestCompositeKey3(t *testing.T) { } user = UserPK2{NickName: "test1"} - cnt, err = testEngine.Id(core.PK{"11", 22}).Update(&user) + cnt, err = testEngine.ID(core.PK{"11", 22}).Update(&user) if err != nil { t.Error(err) } else if cnt != 1 { t.Error(errors.New("can't update User{11, 22}")) } - cnt, err = testEngine.Id(core.PK{"11", 22}).Delete(&UserPK2{}) + cnt, err = testEngine.ID(core.PK{"11", 22}).Delete(&UserPK2{}) if err != nil { t.Error(err) } else if cnt != 1 { @@ -1007,7 +1007,7 @@ func TestMyIntId(t *testing.T) { panic(errors.New("should be equal")) } - cnt, err = testEngine.Id(bean.ID).Delete(&MyIntPK{}) + cnt, err = testEngine.ID(bean.ID).Delete(&MyIntPK{}) if err != nil { t.Error(err) panic(err) @@ -1095,7 +1095,7 @@ func TestMyStringId(t *testing.T) { panic(errors.New("should be equal")) } - cnt, err = testEngine.Id(bean.ID).Delete(&MyStringPK{}) + cnt, err = testEngine.ID(bean.ID).Delete(&MyStringPK{}) if err != nil { t.Error(err) panic(err) diff --git a/session_update_test.go b/session_update_test.go index 70582551..ccd713ae 100644 --- a/session_update_test.go +++ b/session_update_test.go @@ -298,7 +298,7 @@ func TestUpdate1(t *testing.T) { // update by id user := Userinfo{Username: "xxx", Height: 1.2} - cnt, err := testEngine.Id(ori.Uid).Update(&user) + cnt, err := testEngine.ID(ori.Uid).Update(&user) if err != nil { t.Error(err) panic(err) @@ -311,7 +311,7 @@ func TestUpdate1(t *testing.T) { } condi := Condi{"username": "zzz", "departname": ""} - cnt, err = testEngine.Table(&user).Id(ori.Uid).Update(&condi) + cnt, err = testEngine.Table(&user).ID(ori.Uid).Update(&condi) if err != nil { t.Error(err) panic(err) @@ -351,7 +351,7 @@ func TestUpdate1(t *testing.T) { } userID := user.Uid - has, err := testEngine.Id(userID). + has, err := testEngine.ID(userID). And("username = ?", user.Username). And("height = ?", user.Height). And("departname = ?", ""). @@ -369,7 +369,7 @@ func TestUpdate1(t *testing.T) { } updatedUser := &Userinfo{Username: "null data"} - cnt, err = testEngine.Id(userID). + cnt, err = testEngine.ID(userID). Nullable("height", "departname", "is_man", "created"). Update(updatedUser) if err != nil { @@ -382,7 +382,7 @@ func TestUpdate1(t *testing.T) { panic(err) } - has, err = testEngine.Id(userID). + has, err = testEngine.ID(userID). And("username = ?", updatedUser.Username). And("height IS NULL"). And("departname IS NULL"). @@ -400,7 +400,7 @@ func TestUpdate1(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(userID).Delete(&Userinfo{}) + cnt, err = testEngine.ID(userID).Delete(&Userinfo{}) if err != nil { t.Error(err) panic(err) @@ -445,7 +445,7 @@ func TestUpdate1(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(a.Id).Update(&Article{Name: "6"}) + cnt, err = testEngine.ID(a.Id).Update(&Article{Name: "6"}) if err != nil { t.Error(err) panic(err) @@ -474,14 +474,14 @@ func TestUpdate1(t *testing.T) { } col2 := &UpdateAllCols{col1.Id, true, "", nil} - _, err = testEngine.Id(col2.Id).AllCols().Update(col2) + _, err = testEngine.ID(col2.Id).AllCols().Update(col2) if err != nil { t.Error(err) panic(err) } col3 := &UpdateAllCols{} - has, err = testEngine.Id(col2.Id).Get(col3) + has, err = testEngine.ID(col2.Id).Get(col3) if err != nil { t.Error(err) panic(err) @@ -519,14 +519,14 @@ func TestUpdate1(t *testing.T) { col2 := &UpdateMustCols{col1.Id, true, ""} boolStr := testEngine.ColumnMapper.Obj2Table("Bool") stringStr := testEngine.ColumnMapper.Obj2Table("String") - _, err = testEngine.Id(col2.Id).MustCols(boolStr, stringStr).Update(col2) + _, err = testEngine.ID(col2.Id).MustCols(boolStr, stringStr).Update(col2) if err != nil { t.Error(err) panic(err) } col3 := &UpdateMustCols{} - has, err := testEngine.Id(col2.Id).Get(col3) + has, err := testEngine.ID(col2.Id).Get(col3) if err != nil { t.Error(err) panic(err) @@ -561,27 +561,27 @@ func TestUpdateIncrDecr(t *testing.T) { colName := testEngine.ColumnMapper.Obj2Table("Cnt") - cnt, err := testEngine.Id(col1.Id).Incr(colName).Update(col1) + cnt, err := testEngine.ID(col1.Id).Incr(colName).Update(col1) assert.NoError(t, err) assert.EqualValues(t, 1, cnt) newCol := new(UpdateIncr) - has, err := testEngine.Id(col1.Id).Get(newCol) + has, err := testEngine.ID(col1.Id).Get(newCol) assert.NoError(t, err) assert.True(t, has) assert.EqualValues(t, 1, newCol.Cnt) - cnt, err = testEngine.Id(col1.Id).Decr(colName).Update(col1) + cnt, err = testEngine.ID(col1.Id).Decr(colName).Update(col1) assert.NoError(t, err) assert.EqualValues(t, 1, cnt) newCol = new(UpdateIncr) - has, err = testEngine.Id(col1.Id).Get(newCol) + has, err = testEngine.ID(col1.Id).Get(newCol) assert.NoError(t, err) assert.True(t, has) assert.EqualValues(t, 0, newCol.Cnt) - cnt, err = testEngine.Id(col1.Id).Cols(colName).Incr(colName).Update(col1) + cnt, err = testEngine.ID(col1.Id).Cols(colName).Incr(colName).Update(col1) assert.NoError(t, err) assert.EqualValues(t, 1, cnt) } @@ -626,12 +626,12 @@ func TestUpdateUpdated(t *testing.T) { } ci := &UpdatedUpdate{} - _, err = testEngine.Id(1).Update(ci) + _, err = testEngine.ID(1).Update(ci) if err != nil { t.Fatal(err) } - has, err := testEngine.Id(1).Get(di) + has, err := testEngine.ID(1).Get(di) if err != nil { t.Fatal(err) } @@ -654,11 +654,11 @@ func TestUpdateUpdated(t *testing.T) { t.Fatal(err) } ci2 := &UpdatedUpdate2{} - _, err = testEngine.Id(1).Update(ci2) + _, err = testEngine.ID(1).Update(ci2) if err != nil { t.Fatal(err) } - has, err = testEngine.Id(1).Get(di2) + has, err = testEngine.ID(1).Get(di2) if err != nil { t.Fatal(err) } @@ -681,12 +681,12 @@ func TestUpdateUpdated(t *testing.T) { t.Fatal(err) } ci3 := &UpdatedUpdate3{} - _, err = testEngine.Id(1).Update(ci3) + _, err = testEngine.ID(1).Update(ci3) if err != nil { t.Fatal(err) } - has, err = testEngine.Id(1).Get(di3) + has, err = testEngine.ID(1).Get(di3) if err != nil { t.Fatal(err) } @@ -710,12 +710,12 @@ func TestUpdateUpdated(t *testing.T) { } ci4 := &UpdatedUpdate4{} - _, err = testEngine.Id(1).Update(ci4) + _, err = testEngine.ID(1).Update(ci4) if err != nil { t.Fatal(err) } - has, err = testEngine.Id(1).Get(di4) + has, err = testEngine.ID(1).Get(di4) if err != nil { t.Fatal(err) } @@ -738,12 +738,12 @@ func TestUpdateUpdated(t *testing.T) { t.Fatal(err) } ci5 := &UpdatedUpdate5{} - _, err = testEngine.Id(1).Update(ci5) + _, err = testEngine.ID(1).Update(ci5) if err != nil { t.Fatal(err) } - has, err = testEngine.Id(1).Get(di5) + has, err = testEngine.ID(1).Get(di5) if err != nil { t.Fatal(err) } @@ -796,7 +796,7 @@ func TestUpdateSameMapper(t *testing.T) { } // update by id user := Userinfo{Username: "xxx", Height: 1.2} - cnt, err := testEngine.Id(ori.Uid).Update(&user) + cnt, err := testEngine.ID(ori.Uid).Update(&user) if err != nil { t.Error(err) panic(err) @@ -809,7 +809,7 @@ func TestUpdateSameMapper(t *testing.T) { } condi := Condi{"Username": "zzz", "Departname": ""} - cnt, err = testEngine.Table(&user).Id(ori.Uid).Update(&condi) + cnt, err = testEngine.Table(&user).ID(ori.Uid).Update(&condi) if err != nil { t.Error(err) panic(err) @@ -874,7 +874,7 @@ func TestUpdateSameMapper(t *testing.T) { panic(err) } - cnt, err = testEngine.Id(a.Id).Update(&Article{Name: "6"}) + cnt, err = testEngine.ID(a.Id).Update(&Article{Name: "6"}) if err != nil { t.Error(err) panic(err) @@ -901,14 +901,14 @@ func TestUpdateSameMapper(t *testing.T) { } col2 := &UpdateAllCols{col1.Id, true, "", nil} - _, err = testEngine.Id(col2.Id).AllCols().Update(col2) + _, err = testEngine.ID(col2.Id).AllCols().Update(col2) if err != nil { t.Error(err) panic(err) } col3 := &UpdateAllCols{} - has, err = testEngine.Id(col2.Id).Get(col3) + has, err = testEngine.ID(col2.Id).Get(col3) if err != nil { t.Error(err) panic(err) @@ -945,14 +945,14 @@ func TestUpdateSameMapper(t *testing.T) { col2 := &UpdateMustCols{col1.Id, true, ""} boolStr := testEngine.ColumnMapper.Obj2Table("Bool") stringStr := testEngine.ColumnMapper.Obj2Table("String") - _, err = testEngine.Id(col2.Id).MustCols(boolStr, stringStr).Update(col2) + _, err = testEngine.ID(col2.Id).MustCols(boolStr, stringStr).Update(col2) if err != nil { t.Error(err) panic(err) } col3 := &UpdateMustCols{} - has, err := testEngine.Id(col2.Id).Get(col3) + has, err := testEngine.ID(col2.Id).Get(col3) if err != nil { t.Error(err) panic(err) @@ -988,7 +988,7 @@ func TestUpdateSameMapper(t *testing.T) { panic(err) } - cnt, err := testEngine.Id(col1.Id).Incr("`Cnt`").Update(col1) + cnt, err := testEngine.ID(col1.Id).Incr("`Cnt`").Update(col1) if err != nil { t.Error(err) panic(err) @@ -1000,7 +1000,7 @@ func TestUpdateSameMapper(t *testing.T) { } newCol := new(UpdateIncr) - has, err := testEngine.Id(col1.Id).Get(newCol) + has, err := testEngine.ID(col1.Id).Get(newCol) if err != nil { t.Error(err) panic(err) @@ -1119,7 +1119,7 @@ func TestNoUpdate(t *testing.T) { }) assert.NoError(t, err) - _, err = testEngine.Id(1).Update(&NoUpdate{}) + _, err = testEngine.ID(1).Update(&NoUpdate{}) assert.Error(t, err) assert.EqualValues(t, "No content found to be updated", err.Error()) } diff --git a/tag_extends_test.go b/tag_extends_test.go index 4b94fd4b..61a61e9e 100644 --- a/tag_extends_test.go +++ b/tag_extends_test.go @@ -86,7 +86,7 @@ func TestExtends(t *testing.T) { } tu3 := &tempUser2{tempUser{0, "extends update"}, ""} - _, err = testEngine.Id(tu2.TempUser.Id).Update(tu3) + _, err = testEngine.ID(tu2.TempUser.Id).Update(tu3) if err != nil { t.Error(err) panic(err) @@ -124,7 +124,7 @@ func TestExtends(t *testing.T) { } tu10 := &tempUser4{tempUser2{tempUser{0, "extends update"}, ""}} - _, err = testEngine.Id(tu9.TempUser2.TempUser.Id).Update(tu10) + _, err = testEngine.ID(tu9.TempUser2.TempUser.Id).Update(tu10) if err != nil { t.Error(err) panic(err) @@ -168,7 +168,7 @@ func TestExtends(t *testing.T) { } tu6 := &tempUser3{&tempUser{0, "extends update"}, ""} - _, err = testEngine.Id(tu5.Temp.Id).Update(tu6) + _, err = testEngine.ID(tu5.Temp.Id).Update(tu6) if err != nil { t.Error(err) panic(err) diff --git a/tag_test.go b/tag_test.go index edb18506..dc7ff2fa 100644 --- a/tag_test.go +++ b/tag_test.go @@ -51,7 +51,7 @@ func TestCreatedAndUpdated(t *testing.T) { } u.Name = "xxx" - cnt, err = testEngine.Id(u.Id).Update(u) + cnt, err = testEngine.ID(u.Id).Update(u) if err != nil { t.Error(err) panic(err) @@ -130,13 +130,13 @@ func TestCreatedUpdated(t *testing.T) { assert.NoError(t, err) c2 := new(CreatedUpdated) - has, err := testEngine.Id(c.Id).Get(c2) + has, err := testEngine.ID(c.Id).Get(c2) assert.NoError(t, err) assert.True(t, has) c2.Value -= 1 - _, err = testEngine.Id(c2.Id).Update(c2) + _, err = testEngine.ID(c2.Id).Update(c2) assert.NoError(t, err) } diff --git a/tag_version_test.go b/tag_version_test.go index 1aeabcaa..570a6754 100644 --- a/tag_version_test.go +++ b/tag_version_test.go @@ -49,7 +49,7 @@ func TestVersion1(t *testing.T) { } newVer := new(VersionS) - has, err := testEngine.Id(ver.Id).Get(newVer) + has, err := testEngine.ID(ver.Id).Get(newVer) if err != nil { t.Error(err) panic(err) @@ -67,7 +67,7 @@ func TestVersion1(t *testing.T) { } newVer.Name = "-------" - _, err = testEngine.Id(ver.Id).Update(newVer) + _, err = testEngine.ID(ver.Id).Update(newVer) if err != nil { t.Error(err) panic(err) @@ -78,7 +78,7 @@ func TestVersion1(t *testing.T) { } newVer = new(VersionS) - has, err = testEngine.Id(ver.Id).Get(newVer) + has, err = testEngine.ID(ver.Id).Get(newVer) if err != nil { t.Error(err) panic(err) diff --git a/types_null_test.go b/types_null_test.go index 776b2e6e..22fc1024 100644 --- a/types_null_test.go +++ b/types_null_test.go @@ -176,7 +176,7 @@ func TestNullStructUpdate(t *testing.T) { item.Age = sql.NullInt64{23, true} item.Height = sql.NullFloat64{0, false} // update to NULL - affected, err := testEngine.Id(2).Cols("age", "height", "is_man").Update(item) + affected, err := testEngine.ID(2).Cols("age", "height", "is_man").Update(item) if err != nil { t.Error(err) panic(err) @@ -224,7 +224,7 @@ func TestNullStructUpdate(t *testing.T) { // IsMan: sql.NullBool{true, true}, } - _, err := testEngine.AllCols().Id(6).Update(item) + _, err := testEngine.AllCols().ID(6).Update(item) if err != nil { t.Error(err) panic(err) @@ -268,7 +268,7 @@ func TestNullStructFind(t *testing.T) { if true { item := new(NullType) - has, err := testEngine.Id(1).Get(item) + has, err := testEngine.ID(1).Get(item) if err != nil { t.Error(err) panic(err) @@ -305,7 +305,7 @@ func TestNullStructFind(t *testing.T) { if true { item := make([]NullType, 0) - err := testEngine.Id(2).Find(&item) + err := testEngine.ID(2).Find(&item) if err != nil { t.Error(err) panic(err) @@ -390,7 +390,7 @@ func TestNullStructDelete(t *testing.T) { item := new(NullType) - _, err := testEngine.Id(1).Delete(item) + _, err := testEngine.ID(1).Delete(item) if err != nil { t.Error(err) panic(err) diff --git a/types_test.go b/types_test.go index aadf5f69..df4ee70e 100644 --- a/types_test.go +++ b/types_test.go @@ -37,7 +37,7 @@ func TestArrayField(t *testing.T) { assert.EqualValues(t, 1, cnt) var arr ArrayStruct - has, err := testEngine.Id(1).Get(&arr) + has, err := testEngine.ID(1).Get(&arr) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, as.Name, arr.Name) @@ -320,7 +320,7 @@ func TestCustomType2(t *testing.T) { assert.NoError(t, err) user := UserCus{} - exist, err := testEngine.Id(1).Get(&user) + exist, err := testEngine.ID(1).Get(&user) assert.NoError(t, err) assert.True(t, exist)