Skip to content

Commit 754a4df

Browse files
IceberIceber
committed
internalstorage: fix util tests
Signed-off-by: Iceber Gu <[email protected]>
1 parent eb2c8c8 commit 754a4df

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎pkg/storage/internalstorage/resource_storage_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func TestApplyListOptionsToResourceQuery_Owner(t *testing.T) {
8080
OwnerSeniority: 1,
8181
},
8282
expected{
83-
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "cluster" = 'cluster-1' AND owner_uid = 'owner-uid-1')`,
84-
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `cluster` = 'cluster-1' AND owner_uid = 'owner-uid-1')",
83+
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "resources"."cluster" = 'cluster-1' AND owner_uid = 'owner-uid-1')`,
84+
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND owner_uid = 'owner-uid-1')",
8585
"",
8686
},
8787
},
@@ -92,8 +92,8 @@ func TestApplyListOptionsToResourceQuery_Owner(t *testing.T) {
9292
OwnerName: "owner-name-1",
9393
},
9494
expected{
95-
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "cluster" = 'cluster-1' AND name = 'owner-name-1')`,
96-
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `cluster` = 'cluster-1' AND name = 'owner-name-1')",
95+
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "resources"."cluster" = 'cluster-1' AND name = 'owner-name-1')`,
96+
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND name = 'owner-name-1')",
9797
"",
9898
},
9999
},
@@ -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 "resources"."cluster" = 'cluster-1' AND ("resources"."group" = 'apps' AND "resources"."resource" = 'deployments') AND name = 'owner-name-1')`,
122+
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND (`resources`.`group` = 'apps' AND `resources`.`resource` = 'deployments') AND name = 'owner-name-1')",
123123
"",
124124
},
125125
},
@@ -161,8 +161,8 @@ func TestApplyListOptionsToResourceQuery_Owner(t *testing.T) {
161161
OwnerSeniority: 1,
162162
},
163163
expected{
164-
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "cluster" = 'cluster-1' AND owner_uid = 'owner-uid-1')`,
165-
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `cluster` = 'cluster-1' AND owner_uid = 'owner-uid-1')",
164+
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "resources"."cluster" = 'cluster-1' AND owner_uid = 'owner-uid-1')`,
165+
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND owner_uid = 'owner-uid-1')",
166166
"",
167167
},
168168
},
@@ -174,8 +174,8 @@ func TestApplyListOptionsToResourceQuery_Owner(t *testing.T) {
174174
OwnerName: "owner-name-1",
175175
},
176176
expected{
177-
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "cluster" = 'cluster-1' AND namespace IN ('ns-1','ns-2','') AND name = 'owner-name-1')`,
178-
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `cluster` = 'cluster-1' AND namespace IN ('ns-1','ns-2','') AND name = 'owner-name-1')",
177+
`SELECT * FROM "resources" WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT "uid" FROM "resources" WHERE "resources"."cluster" = 'cluster-1' AND namespace IN ('ns-1','ns-2','') AND name = 'owner-name-1')`,
178+
"SELECT * FROM `resources` WHERE cluster = 'cluster-1' AND namespace IN ('ns-1','ns-2') AND owner_uid IN (SELECT `uid` FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND namespace IN ('ns-1','ns-2','') AND name = 'owner-name-1')",
179179
"",
180180
},
181181
},
@@ -202,8 +202,8 @@ func TestResourceStorage_genGetObjectQuery(t *testing.T) {
202202
"",
203203
"",
204204
expected{
205-
`SELECT "object" FROM "resources" WHERE "cluster" = '' AND "group" = '' AND "name" = '' AND "namespace" = '' AND "resource" = '' AND "version" = '' ORDER BY "resources"."id" LIMIT 1`,
206-
"SELECT `object` FROM `resources` WHERE `cluster` = '' AND `group` = '' AND `name` = '' AND `namespace` = '' AND `resource` = '' AND `version` = '' ORDER BY `resources`.`id` LIMIT 1",
205+
`SELECT "object" FROM "resources" WHERE "resources"."cluster" = '' AND "resources"."group" = '' AND "resources"."name" = '' AND "resources"."namespace" = '' AND "resources"."resource" = '' AND "resources"."version" = '' ORDER BY "resources"."id" LIMIT 1`,
206+
"SELECT `object` FROM `resources` WHERE `resources`.`cluster` = '' AND `resources`.`group` = '' AND `resources`.`name` = '' AND `resources`.`namespace` = '' AND `resources`.`resource` = '' AND `resources`.`version` = '' ORDER BY `resources`.`id` LIMIT 1",
207207
"",
208208
},
209209
},
@@ -214,8 +214,8 @@ func TestResourceStorage_genGetObjectQuery(t *testing.T) {
214214
"ns-1",
215215
"resource-1",
216216
expected{
217-
`SELECT "object" FROM "resources" WHERE "cluster" = 'cluster-1' AND "group" = 'apps' AND "name" = 'resource-1' AND "namespace" = 'ns-1' AND "resource" = 'deployments' AND "version" = 'v1' ORDER BY "resources"."id" LIMIT 1`,
218-
"SELECT `object` FROM `resources` WHERE `cluster` = 'cluster-1' AND `group` = 'apps' AND `name` = 'resource-1' AND `namespace` = 'ns-1' AND `resource` = 'deployments' AND `version` = 'v1' ORDER BY `resources`.`id` LIMIT 1",
217+
`SELECT "object" FROM "resources" WHERE "resources"."cluster" = 'cluster-1' AND "resources"."group" = 'apps' AND "resources"."name" = 'resource-1' AND "resources"."namespace" = 'ns-1' AND "resources"."resource" = 'deployments' AND "resources"."version" = 'v1' ORDER BY "resources"."id" LIMIT 1`,
218+
"SELECT `object` FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND `resources`.`group` = 'apps' AND `resources`.`name` = 'resource-1' AND `resources`.`namespace` = 'ns-1' AND `resources`.`resource` = 'deployments' AND `resources`.`version` = 'v1' ORDER BY `resources`.`id` LIMIT 1",
219219
"",
220220
},
221221
},
@@ -259,8 +259,8 @@ func TestResourceStorage_genListObjectQuery(t *testing.T) {
259259
appsv1.SchemeGroupVersion.WithResource("deployments"),
260260
&internal.ListOptions{},
261261
expected{
262-
`SELECT * FROM "resources" WHERE "group" = 'apps' AND "resource" = 'deployments' AND "version" = 'v1'`,
263-
"SELECT * FROM `resources` WHERE `group` = 'apps' AND `resource` = 'deployments' AND `version` = 'v1'",
262+
`SELECT * FROM "resources" WHERE "resources"."group" = 'apps' AND "resources"."resource" = 'deployments' AND "resources"."version" = 'v1'`,
263+
"SELECT * FROM `resources` WHERE `resources`.`group` = 'apps' AND `resources`.`resource` = 'deployments' AND `resources`.`version` = 'v1'",
264264
"",
265265
},
266266
},
@@ -316,8 +316,8 @@ func TestResourceStorage_deleteObject(t *testing.T) {
316316
"",
317317
"",
318318
expected{
319-
`DELETE FROM "resources" WHERE "cluster" = '' AND "group" = 'apps' AND "name" = '' AND "namespace" = '' AND "resource" = 'deployments' AND "version" = 'v1'`,
320-
"DELETE FROM `resources` WHERE `cluster` = '' AND `group` = 'apps' AND `name` = '' AND `namespace` = '' AND `resource` = 'deployments' AND `version` = 'v1'",
319+
`DELETE FROM "resources" WHERE "resources"."cluster" = '' AND "resources"."group" = 'apps' AND "resources"."name" = '' AND "resources"."namespace" = '' AND "resources"."resource" = 'deployments' AND "resources"."version" = 'v1'`,
320+
"DELETE FROM `resources` WHERE `resources`.`cluster` = '' AND `resources`.`group` = 'apps' AND `resources`.`name` = '' AND `resources`.`namespace` = '' AND `resources`.`resource` = 'deployments' AND `resources`.`version` = 'v1'",
321321
"",
322322
},
323323
},
@@ -328,8 +328,8 @@ func TestResourceStorage_deleteObject(t *testing.T) {
328328
"ns-1",
329329
"resource-1",
330330
expected{
331-
`DELETE FROM "resources" WHERE "cluster" = 'cluster-1' AND "group" = 'apps' AND "name" = 'resource-1' AND "namespace" = 'ns-1' AND "resource" = 'deployments' AND "version" = 'v1'`,
332-
"DELETE FROM `resources` WHERE `cluster` = 'cluster-1' AND `group` = 'apps' AND `name` = 'resource-1' AND `namespace` = 'ns-1' AND `resource` = 'deployments' AND `version` = 'v1'",
331+
`DELETE FROM "resources" WHERE "resources"."cluster" = 'cluster-1' AND "resources"."group" = 'apps' AND "resources"."name" = 'resource-1' AND "resources"."namespace" = 'ns-1' AND "resources"."resource" = 'deployments' AND "resources"."version" = 'v1'`,
332+
"DELETE FROM `resources` WHERE `resources`.`cluster` = 'cluster-1' AND `resources`.`group` = 'apps' AND `resources`.`name` = 'resource-1' AND `resources`.`namespace` = 'ns-1' AND `resources`.`resource` = 'deployments' AND `resources`.`version` = 'v1'",
333333
"",
334334
},
335335
},

0 commit comments

Comments
 (0)