public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K8s: Get trash fixes (#106411)

Browse Source
This commit is contained in:
Stephanie Hingtgen
2025-06-11 13:54:38 -05:00
committed by GitHub
parent 8fdf86e56f
commit 7864c1660f
12 changed files with 367 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/testdata/mysql--resource_trash-read trash second page.sql
Vendored Executable
+35
View File
@@ -0,0 +1,35 @@
SELECT
h.`guid`,
h.`resource_version`,
h.`namespace`,
h.`group`,
h.`resource`,
h.`name`,
h.`folder`,
h.`value`
FROM `resource_history` h
INNER JOIN (
SELECT `name`, MAX(`resource_version`) as max_rv
FROM `resource_history`
WHERE 1 = 1
AND `namespace` = 'nn'
AND `group` = 'gg'
AND `resource` = 'rr'
AND `action` = 3
AND `resource_version` < 123456
GROUP BY `name`
) max_versions ON h.`name` = max_versions.`name`
AND h.`resource_version` = max_versions.max_rv
WHERE 1 = 1
AND h.`namespace` = 'nn'
AND h.`group` = 'gg'
AND h.`resource` = 'rr'
AND h.`action` = 3
AND NOT EXISTS (
SELECT 1 FROM `resource` r
WHERE r.`namespace` = h.`namespace`
AND r.`group` = h.`group`
AND r.`resource` = h.`resource`
AND r.`name` = h.`name`
)
ORDER BY h.`resource_version` DESC
pkg/storage/unified/sql/testdata/mysql--resource_trash-read trash.sql
Vendored Executable
+34
View File
@@ -0,0 +1,34 @@
SELECT
h.`guid`,
h.`resource_version`,
h.`namespace`,
h.`group`,
h.`resource`,
h.`name`,
h.`folder`,
h.`value`
FROM `resource_history` h
INNER JOIN (
SELECT `name`, MAX(`resource_version`) as max_rv
FROM `resource_history`
WHERE 1 = 1
AND `namespace` = 'nn'
AND `group` = 'gg'
AND `resource` = 'rr'
AND `action` = 3
GROUP BY `name`
) max_versions ON h.`name` = max_versions.`name`
AND h.`resource_version` = max_versions.max_rv
WHERE 1 = 1
AND h.`namespace` = 'nn'
AND h.`group` = 'gg'
AND h.`resource` = 'rr'
AND h.`action` = 3
AND NOT EXISTS (
SELECT 1 FROM `resource` r
WHERE r.`namespace` = h.`namespace`
AND r.`group` = h.`group`
AND r.`resource` = h.`resource`
AND r.`name` = h.`name`
)
ORDER BY h.`resource_version` DESC
pkg/storage/unified/sql/testdata/postgres--resource_trash-read trash second page.sql
Vendored Executable
+35
View File
@@ -0,0 +1,35 @@
SELECT
h."guid",
h."resource_version",
h."namespace",
h."group",
h."resource",
h."name",
h."folder",
h."value"
FROM "resource_history" h
INNER JOIN (
SELECT "name", MAX("resource_version") as max_rv
FROM "resource_history"
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "action" = 3
AND "resource_version" < 123456
GROUP BY "name"
) max_versions ON h."name" = max_versions."name"
AND h."resource_version" = max_versions.max_rv
WHERE 1 = 1
AND h."namespace" = 'nn'
AND h."group" = 'gg'
AND h."resource" = 'rr'
AND h."action" = 3
AND NOT EXISTS (
SELECT 1 FROM "resource" r
WHERE r."namespace" = h."namespace"
AND r."group" = h."group"
AND r."resource" = h."resource"
AND r."name" = h."name"
)
ORDER BY h."resource_version" DESC
pkg/storage/unified/sql/testdata/postgres--resource_trash-read trash.sql
Vendored Executable
+34
View File
@@ -0,0 +1,34 @@
SELECT
h."guid",
h."resource_version",
h."namespace",
h."group",
h."resource",
h."name",
h."folder",
h."value"
FROM "resource_history" h
INNER JOIN (
SELECT "name", MAX("resource_version") as max_rv
FROM "resource_history"
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "action" = 3
GROUP BY "name"
) max_versions ON h."name" = max_versions."name"
AND h."resource_version" = max_versions.max_rv
WHERE 1 = 1
AND h."namespace" = 'nn'
AND h."group" = 'gg'
AND h."resource" = 'rr'
AND h."action" = 3
AND NOT EXISTS (
SELECT 1 FROM "resource" r
WHERE r."namespace" = h."namespace"
AND r."group" = h."group"
AND r."resource" = h."resource"
AND r."name" = h."name"
)
ORDER BY h."resource_version" DESC
pkg/storage/unified/sql/testdata/sqlite--resource_trash-read trash second page.sql
Vendored Executable
+35
View File
@@ -0,0 +1,35 @@
SELECT
h."guid",
h."resource_version",
h."namespace",
h."group",
h."resource",
h."name",
h."folder",
h."value"
FROM "resource_history" h
INNER JOIN (
SELECT "name", MAX("resource_version") as max_rv
FROM "resource_history"
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "action" = 3
AND "resource_version" < 123456
GROUP BY "name"
) max_versions ON h."name" = max_versions."name"
AND h."resource_version" = max_versions.max_rv
WHERE 1 = 1
AND h."namespace" = 'nn'
AND h."group" = 'gg'
AND h."resource" = 'rr'
AND h."action" = 3
AND NOT EXISTS (
SELECT 1 FROM "resource" r
WHERE r."namespace" = h."namespace"
AND r."group" = h."group"
AND r."resource" = h."resource"
AND r."name" = h."name"
)
ORDER BY h."resource_version" DESC
pkg/storage/unified/sql/testdata/sqlite--resource_trash-read trash.sql
Vendored Executable
+34
View File
@@ -0,0 +1,34 @@
SELECT
h."guid",
h."resource_version",
h."namespace",
h."group",
h."resource",
h."name",
h."folder",
h."value"
FROM "resource_history" h
INNER JOIN (
SELECT "name", MAX("resource_version") as max_rv
FROM "resource_history"
WHERE 1 = 1
AND "namespace" = 'nn'
AND "group" = 'gg'
AND "resource" = 'rr'
AND "action" = 3
GROUP BY "name"
) max_versions ON h."name" = max_versions."name"
AND h."resource_version" = max_versions.max_rv
WHERE 1 = 1
AND h."namespace" = 'nn'
AND h."group" = 'gg'
AND h."resource" = 'rr'
AND h."action" = 3
AND NOT EXISTS (
SELECT 1 FROM "resource" r
WHERE r."namespace" = h."namespace"
AND r."group" = h."group"
AND r."resource" = h."resource"
AND r."name" = h."name"
)
ORDER BY h."resource_version" DESC