Skip to content

Commit 55162d0

Browse files
committed
internalstorage: update tests bescause go-gorm/gorm#6766
Signed-off-by: Iceber Gu <[email protected]>
1 parent 34e9f07 commit 55162d0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkg/storage/internalstorage/resource_storage_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ func TestApplyListOptionsToResourceQuery_Owner(t *testing.T) {
118118
OwnerGroupResource: schema.GroupResource{Group: "apps", Resource: "deployments"},
119119
},
120120
expected{
121-
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "cluster" = 'cluster-1' AND "group" = 'apps' AND "resource" = 'deployments' AND name = 'owner-name-1')`,
122-
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `cluster` = 'cluster-1' AND `group` = 'apps' AND `resource` = 'deployments' AND name = 'owner-name-1')",
121+
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "cluster" = 'cluster-1' AND ("group" = 'apps' AND "resource" = 'deployments') AND name = 'owner-name-1')`,
122+
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `cluster` = 'cluster-1' AND (`group` = 'apps' AND `resource` = 'deployments') AND name = 'owner-name-1')",
123123
"",
124124
},
125125
},

pkg/storage/internalstorage/util_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,12 +1134,12 @@ func TestApplyListOptionsURLQueryParameterizedQueryToWhereClause(t *testing.T) {
11341134
},
11351135

11361136
testSQLQueriesAssertionTestCase: testSQLQueriesAssertionTestCase{
1137-
postgresRawQuery: "SELECT * FROM \"resources\" WHERE test_column = ' OR (\\'1\\' = \\'1'",
1137+
postgresRawQuery: "SELECT * FROM \"resources\" WHERE test_column = ' OR (''1'' = ''1'",
11381138
postgresUnexplainedRawQuery: "SELECT * FROM \"resources\" WHERE test_column = $1",
11391139
postgresSqlmockDBExecutedQuery: "SELECT \\* FROM \"resources\" WHERE test_column = \\$1",
11401140
postgresSqlmockDBExecutedArgs: []driver.Value{" OR ('1' = '1"},
11411141

1142-
mysqlRawQuery: "SELECT * FROM `resources` WHERE test_column = ' OR (\\'1\\' = \\'1'",
1142+
mysqlRawQuery: "SELECT * FROM `resources` WHERE test_column = ' OR (''1'' = ''1'",
11431143
mysqlUnexplainedRawQuery: "SELECT * FROM `resources` WHERE test_column = ?",
11441144
mysqlSqlmockDBExecutedQuery: "SELECT \\* FROM `resources` WHERE test_column = \\?",
11451145
mysqlSqlmockDBExecutedArgs: []driver.Value{" OR ('1' = '1"},
@@ -1160,7 +1160,7 @@ func TestApplyListOptionsURLQueryParameterizedQueryToWhereClause(t *testing.T) {
11601160
},
11611161

11621162
testSQLQueriesAssertionTestCase: testSQLQueriesAssertionTestCase{
1163-
postgresRawQuery: "SELECT * FROM \"resources\" WHERE test_column = ' OR (\\'1\\' = \\'1\\'); --' AND test_column2 = true",
1163+
postgresRawQuery: "SELECT * FROM \"resources\" WHERE test_column = ' OR (''1'' = ''1''); --' AND test_column2 = true",
11641164
postgresUnexplainedRawQuery: "SELECT * FROM \"resources\" WHERE test_column = $1 AND test_column2 = true",
11651165
postgresSqlmockDBExecutedQuery: "SELECT \\* FROM \"resources\" WHERE test_column = \\$1",
11661166
postgresSqlmockDBExecutedArgs: []driver.Value{" OR ('1' = '1'); --"},
@@ -1184,7 +1184,7 @@ func TestApplyListOptionsURLQueryParameterizedQueryToWhereClause(t *testing.T) {
11841184
testSQLQueriesAssertionTestCase: testSQLQueriesAssertionTestCase{
11851185
ignorePostgres: true,
11861186

1187-
mysqlRawQuery: "SELECT * FROM `resources` WHERE test_column = ' OR (\\'1\\' = \\'1\\'); #' AND test_column2 = true",
1187+
mysqlRawQuery: "SELECT * FROM `resources` WHERE test_column = ' OR (''1'' = ''1''); #' AND test_column2 = true",
11881188
mysqlUnexplainedRawQuery: "SELECT * FROM `resources` WHERE test_column = ? AND test_column2 = true",
11891189
mysqlSqlmockDBExecutedQuery: "SELECT \\* FROM `resources` WHERE test_column = \\? AND test_column2 = true",
11901190
mysqlSqlmockDBExecutedArgs: []driver.Value{" OR ('1' = '1'); #"},
@@ -1242,12 +1242,12 @@ func TestApplyListOptionsURLQueryParameterizedQueryToWhereClause(t *testing.T) {
12421242
},
12431243

12441244
testSQLQueriesAssertionTestCase: testSQLQueriesAssertionTestCase{
1245-
postgresRawQuery: "SELECT * FROM \"resources\" WHERE test_column = ' UNION SELECT \\'a\\',NULL,NULL;--'",
1245+
postgresRawQuery: "SELECT * FROM \"resources\" WHERE test_column = ' UNION SELECT ''a'',NULL,NULL;--'",
12461246
postgresUnexplainedRawQuery: "SELECT * FROM \"resources\" WHERE test_column = $1",
12471247
postgresSqlmockDBExecutedQuery: "SELECT \\* FROM \"resources\" WHERE test_column = \\$1",
12481248
postgresSqlmockDBExecutedArgs: []driver.Value{" UNION SELECT 'a',NULL,NULL;--"},
12491249

1250-
mysqlRawQuery: "SELECT * FROM `resources` WHERE test_column = ' UNION SELECT \\'a\\',NULL,NULL;--'",
1250+
mysqlRawQuery: "SELECT * FROM `resources` WHERE test_column = ' UNION SELECT ''a'',NULL,NULL;--'",
12511251
mysqlUnexplainedRawQuery: "SELECT * FROM `resources` WHERE test_column = ?",
12521252
mysqlSqlmockDBExecutedQuery: "SELECT \\* FROM `resources` WHERE test_column = \\?",
12531253
mysqlSqlmockDBExecutedArgs: []driver.Value{" UNION SELECT 'a',NULL,NULL;--"},

0 commit comments

Comments
 (0)