From fe34b1a86caff2f21f25c0000a11057dcc890153 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 12 Jun 2021 16:28:41 +0800 Subject: [PATCH 1/2] Add test for get map with NULL column --- integrations/session_get_test.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/integrations/session_get_test.go b/integrations/session_get_test.go index f4338b4f..07fe7e13 100644 --- a/integrations/session_get_test.go +++ b/integrations/session_get_test.go @@ -347,6 +347,28 @@ func TestGetSlice(t *testing.T) { assert.Error(t, err) } +func TestGetMap(t *testing.T) { + assert.NoError(t, PrepareEngine()) + + type UserinfoMap struct { + Uid int `xorm:"pk autoincr"` + IsMan bool + } + + assertSync(t, new(UserinfoMap)) + + _, err := testEngine.Exec("INSERT INTO userinfo_map (is_man) VALUES (NULL)") + assert.NoError(t, err) + + var valuesString = make(map[string]string) + has, err := testEngine.Table("userinfo_map").Get(&valuesString) + assert.NoError(t, err) + assert.Equal(t, true, has) + assert.Equal(t, 2, len(valuesString)) + assert.Equal(t, "1", valuesString["uid"]) + assert.Equal(t, "", valuesString["is_man"]) +} + func TestGetError(t *testing.T) { assert.NoError(t, PrepareEngine()) -- 2.40.1 From 5891e4a7bf20ce8c83d6814b5bec3b5788eb348d Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 7 Jul 2021 17:13:50 +0800 Subject: [PATCH 2/2] Fix table name with schemas test --- integrations/session_get_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integrations/session_get_test.go b/integrations/session_get_test.go index 07fe7e13..9f82ce73 100644 --- a/integrations/session_get_test.go +++ b/integrations/session_get_test.go @@ -357,7 +357,8 @@ func TestGetMap(t *testing.T) { assertSync(t, new(UserinfoMap)) - _, err := testEngine.Exec("INSERT INTO userinfo_map (is_man) VALUES (NULL)") + tableName := testEngine.Quote(testEngine.TableName("userinfo_map", true)) + _, err := testEngine.Exec(fmt.Sprintf("INSERT INTO %s (is_man) VALUES (NULL)", tableName)) assert.NoError(t, err) var valuesString = make(map[string]string) -- 2.40.1