From 8a5cf384be08345eade936c79c028471176c3738 Mon Sep 17 00:00:00 2001 From: "yong.an" Date: Tue, 7 Jun 2022 11:52:25 +0800 Subject: [PATCH] fix test case issue --- integrations/session_get_test.go | 46 ++++++++++++++++---------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/integrations/session_get_test.go b/integrations/session_get_test.go index 5cb9ca94..a1efeee4 100644 --- a/integrations/session_get_test.go +++ b/integrations/session_get_test.go @@ -47,25 +47,25 @@ func TestShadowGetVar(t *testing.T) { assert.NoError(t, err) var msg string - has, err := testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("msg").Get(&msg) + has, err := testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("msg").Get(&msg) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, "hi", msg) var age int - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age").Get(&age) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age").Get(&age) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, 28, age) var ageMax int - has, err = testEngine.SQL("SELECT max(`age`) FROM "+testEngine.Quote(testEngine.ContextTableName(context.Background(), "get_var"))+" WHERE `id` = ?", data.Id).Get(&ageMax) + has, err = testEngine.SQL("SELECT max(`age`) FROM "+testEngine.Quote(testEngine.ContextTableName(context.Background(), "shadow_get_var"))+" WHERE `id` = ?", data.Id).Get(&ageMax) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, 28, ageMax) var age2 int64 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age"). + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age"). Where("`age` > ?", 20). And("`age` < ?", 30). Get(&age2) @@ -74,13 +74,13 @@ func TestShadowGetVar(t *testing.T) { assert.EqualValues(t, 28, age2) var age3 int8 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age").Get(&age3) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age").Get(&age3) assert.NoError(t, err) assert.Equal(t, true, has) assert.EqualValues(t, 28, age3) var age4 int16 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age"). + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age"). Where("`age` > ?", 20). And("`age` < ?", 30). Get(&age4) @@ -89,7 +89,7 @@ func TestShadowGetVar(t *testing.T) { assert.EqualValues(t, 28, age4) var age5 int32 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age"). + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age"). Where("`age` > ?", 20). And("`age` < ?", 30). Get(&age5) @@ -98,13 +98,13 @@ func TestShadowGetVar(t *testing.T) { assert.EqualValues(t, 28, age5) var age6 int - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age").Get(&age6) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age").Get(&age6) assert.NoError(t, err) assert.Equal(t, true, has) assert.EqualValues(t, 28, age6) var age7 int64 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age"). + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age"). Where("`age` > ?", 20). And("`age` < ?", 30). Get(&age7) @@ -113,13 +113,13 @@ func TestShadowGetVar(t *testing.T) { assert.EqualValues(t, 28, age7) var age8 int8 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age").Get(&age8) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age").Get(&age8) assert.NoError(t, err) assert.Equal(t, true, has) assert.EqualValues(t, 28, age8) var age9 int16 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age"). + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age"). Where("`age` > ?", 20). And("`age` < ?", 30). Get(&age9) @@ -128,7 +128,7 @@ func TestShadowGetVar(t *testing.T) { assert.EqualValues(t, 28, age9) var age10 int32 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("age"). + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("age"). Where("`age` > ?", 20). And("`age` < ?", 30). Get(&age10) @@ -137,48 +137,48 @@ func TestShadowGetVar(t *testing.T) { assert.EqualValues(t, 28, age10) var id sql.NullInt64 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("id").Get(&id) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("id").Get(&id) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, true, id.Valid) var msgNull sql.NullString - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("msg").Get(&msgNull) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("msg").Get(&msgNull) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, true, msgNull.Valid) assert.EqualValues(t, data.Msg, msgNull.String) var nullMoney sql.NullFloat64 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("money").Get(&nullMoney) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("money").Get(&nullMoney) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, true, nullMoney.Valid) assert.EqualValues(t, data.Money, nullMoney.Float64) var money float64 - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Cols("money").Get(&money) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Cols("money").Get(&money) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, "1.5", fmt.Sprintf("%.1f", money)) var money2 float64 if testEngine.Dialect().URI().DBType == schemas.MSSQL { - has, err = testEngine.SQL("SELECT TOP 1 `money` FROM " + testEngine.Quote(testEngine.ContextTableName(context.Background(), "get_var"))).Get(&money2) + has, err = testEngine.SQL("SELECT TOP 1 `money` FROM " + testEngine.Quote(testEngine.ContextTableName(context.Background(), "shadow_get_var"))).Get(&money2) } else { - has, err = testEngine.SQL("SELECT `money` FROM " + testEngine.Quote(testEngine.ContextTableName(context.Background(), "get_var")) + " LIMIT 1").Get(&money2) + has, err = testEngine.SQL("SELECT `money` FROM " + testEngine.Quote(testEngine.ContextTableName(context.Background(), "shadow_get_var")) + " LIMIT 1").Get(&money2) } assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, "1.5", fmt.Sprintf("%.1f", money2)) var money3 float64 - has, err = testEngine.SQL("SELECT `money` FROM " + testEngine.Quote(testEngine.ContextTableName(context.Background(), "get_var")) + " WHERE `money` > 20").Get(&money3) + has, err = testEngine.SQL("SELECT `money` FROM " + testEngine.Quote(testEngine.ContextTableName(context.Background(), "shadow_get_var")) + " WHERE `money` > 20").Get(&money3) assert.NoError(t, err) assert.Equal(t, false, has) valuesString := make(map[string]string) - has, err = testEngine.Table("get_var").Get(&valuesString) + has, err = testEngine.Table("shadow_get_var").Get(&valuesString) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, 5, len(valuesString)) @@ -190,7 +190,7 @@ func TestShadowGetVar(t *testing.T) { // for mymysql driver, interface{} will be []byte, so ignore it currently if testEngine.DriverName() != "mymysql" { valuesInter := make(map[string]interface{}) - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Where("`id` = ?", 1).Select("*").Get(&valuesInter) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Where("`id` = ?", 1).Select("*").Get(&valuesInter) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, 5, len(valuesInter)) @@ -201,7 +201,7 @@ func TestShadowGetVar(t *testing.T) { } valuesSliceString := make([]string, 5) - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Get(&valuesSliceString) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Get(&valuesSliceString) assert.NoError(t, err) assert.Equal(t, true, has) assert.Equal(t, "1", valuesSliceString[0]) @@ -210,7 +210,7 @@ func TestShadowGetVar(t *testing.T) { assert.Equal(t, "1.5", valuesSliceString[3]) valuesSliceInter := make([]interface{}, 5) - has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "get_var")).Get(&valuesSliceInter) + has, err = testEngine.Table(testEngine.ContextTableName(context.Background(), "shadow_get_var")).Get(&valuesSliceInter) assert.NoError(t, err) assert.Equal(t, true, has)