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

Unitstore: Fix the Folder migration (#96078)

Browse Source 
* UniStore: Add folder to the SQL backend

This reverts commit aaa4f4a23e.

* fix folder migration
This commit is contained in:
Georges Chaudy
2024-11-12 12:52:04 +01:00
committed by GitHub
parent 7f675cd218
commit c3571752b6
43 changed files with 235 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/sql/testdata/mysql--resource_history_insert-insert into resource_history.sql
Vendored
+2
View File
@@ -5,6 +5,7 @@ INSERT INTO `resource_history`
`resource`,
`namespace`,
`name`,
`folder`,
`previous_resource_version`,
`value`,
`action`
@@ -15,6 +16,7 @@ INSERT INTO `resource_history`
'rr',
'nn',
'name',
'fldr',
1234,
'[]',
'UNKNOWN'
pkg/storage/unified/sql/testdata/mysql--resource_history_list-single path.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ SELECT
kv.`resource_version`,
kv.`namespace`,
kv.`name`,
kv.`folder`,
kv.`value`
FROM `resource_history` as kv
INNER JOIN (
pkg/storage/unified/sql/testdata/mysql--resource_history_poll-single path.sql
Vendored
+1
View File
@@ -4,6 +4,7 @@ SELECT
`group`,
`resource`,
`name`,
`folder`,
`value`,
`action`,
`previous_resource_version`
pkg/storage/unified/sql/testdata/mysql--resource_history_read-single path.sql
Vendored
+9 -4
View File
@@ -1,12 +1,17 @@
SELECT
`namespace`,
`group`,
`resource`,
`name`,
`folder`,
`resource_version`,
`value`
FROM `resource_history`
WHERE 1 = 1
AND `namespace` = ''
AND `group` = ''
AND `resource` = ''
AND `name` = ''
AND `namespace` = 'ns'
AND `group` = 'gp'
AND `resource` = 'rs'
AND `name` = 'nm'
AND `resource_version` <= 123
ORDER BY `resource_version` DESC
LIMIT 1
pkg/storage/unified/sql/testdata/mysql--resource_insert-simple.sql
Vendored
+2
View File
@@ -5,6 +5,7 @@ INSERT INTO `resource`
`resource`,
`namespace`,
`name`,
`folder`,
`previous_resource_version`,
`value`,
`action`
@@ -15,6 +16,7 @@ INSERT INTO `resource`
'rr',
'nn',
'name',
'fldr',
123,
'[]',
'ADDED'
pkg/storage/unified/sql/testdata/mysql--resource_list-filter_on_namespace.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ SELECT
`resource_version`,
`namespace`,
`name`,
`folder`,
`value`
FROM `resource`
WHERE 1 = 1
pkg/storage/unified/sql/testdata/mysql--resource_read-without_resource_version.sql
Vendored
+5
View File
@@ -1,4 +1,9 @@
SELECT
`namespace`,
`group`,
`resource`,
`name`,
`folder`,
`resource_version`,
`value`
FROM `resource`
pkg/storage/unified/sql/testdata/mysql--resource_update-single path.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ UPDATE `resource`
SET
`guid` = '',
`value` = '[]',
`folder` = 'fldr',
`action` = 'UNKNOWN'
WHERE 1 = 1
AND `group` = 'gg'
pkg/storage/unified/sql/testdata/postgres--resource_history_insert-insert into resource_history.sql
Vendored
+2
View File
@@ -5,6 +5,7 @@ INSERT INTO "resource_history"
"resource",
"namespace",
"name",
"folder",
"previous_resource_version",
"value",
"action"
@@ -15,6 +16,7 @@ INSERT INTO "resource_history"
'rr',
'nn',
'name',
'fldr',
1234,
'[]',
'UNKNOWN'
pkg/storage/unified/sql/testdata/postgres--resource_history_list-single path.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ SELECT
kv."resource_version",
kv."namespace",
kv."name",
kv."folder",
kv."value"
FROM "resource_history" as kv
INNER JOIN (
pkg/storage/unified/sql/testdata/postgres--resource_history_poll-single path.sql
Vendored
+1
View File
@@ -4,6 +4,7 @@ SELECT
"group",
"resource",
"name",
"folder",
"value",
"action",
"previous_resource_version"
pkg/storage/unified/sql/testdata/postgres--resource_history_read-single path.sql
Vendored
+9 -4
View File
@@ -1,12 +1,17 @@
SELECT
"namespace",
"group",
"resource",
"name",
"folder",
"resource_version",
"value"
FROM "resource_history"
WHERE 1 = 1
AND "namespace" = ''
AND "group" = ''
AND "resource" = ''
AND "name" = ''
AND "namespace" = 'ns'
AND "group" = 'gp'
AND "resource" = 'rs'
AND "name" = 'nm'
AND "resource_version" <= 123
ORDER BY "resource_version" DESC
LIMIT 1
pkg/storage/unified/sql/testdata/postgres--resource_insert-simple.sql
Vendored
+2
View File
@@ -5,6 +5,7 @@ INSERT INTO "resource"
"resource",
"namespace",
"name",
"folder",
"previous_resource_version",
"value",
"action"
@@ -15,6 +16,7 @@ INSERT INTO "resource"
'rr',
'nn',
'name',
'fldr',
123,
'[]',
'ADDED'
pkg/storage/unified/sql/testdata/postgres--resource_list-filter_on_namespace.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ SELECT
"resource_version",
"namespace",
"name",
"folder",
"value"
FROM "resource"
WHERE 1 = 1
pkg/storage/unified/sql/testdata/postgres--resource_read-without_resource_version.sql
Vendored
+5
View File
@@ -1,4 +1,9 @@
SELECT
"namespace",
"group",
"resource",
"name",
"folder",
"resource_version",
"value"
FROM "resource"
pkg/storage/unified/sql/testdata/postgres--resource_update-single path.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ UPDATE "resource"
SET
"guid" = '',
"value" = '[]',
"folder" = 'fldr',
"action" = 'UNKNOWN'
WHERE 1 = 1
AND "group" = 'gg'
pkg/storage/unified/sql/testdata/sqlite--resource_history_insert-insert into resource_history.sql
Vendored
+2
View File
@@ -5,6 +5,7 @@ INSERT INTO "resource_history"
"resource",
"namespace",
"name",
"folder",
"previous_resource_version",
"value",
"action"
@@ -15,6 +16,7 @@ INSERT INTO "resource_history"
'rr',
'nn',
'name',
'fldr',
1234,
'[]',
'UNKNOWN'
pkg/storage/unified/sql/testdata/sqlite--resource_history_list-single path.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ SELECT
kv."resource_version",
kv."namespace",
kv."name",
kv."folder",
kv."value"
FROM "resource_history" as kv
INNER JOIN (
pkg/storage/unified/sql/testdata/sqlite--resource_history_poll-single path.sql
Vendored
+1
View File
@@ -4,6 +4,7 @@ SELECT
"group",
"resource",
"name",
"folder",
"value",
"action",
"previous_resource_version"
pkg/storage/unified/sql/testdata/sqlite--resource_history_read-single path.sql
Vendored
+9 -4
View File
@@ -1,12 +1,17 @@
SELECT
"namespace",
"group",
"resource",
"name",
"folder",
"resource_version",
"value"
FROM "resource_history"
WHERE 1 = 1
AND "namespace" = ''
AND "group" = ''
AND "resource" = ''
AND "name" = ''
AND "namespace" = 'ns'
AND "group" = 'gp'
AND "resource" = 'rs'
AND "name" = 'nm'
AND "resource_version" <= 123
ORDER BY "resource_version" DESC
LIMIT 1
pkg/storage/unified/sql/testdata/sqlite--resource_insert-simple.sql
Vendored
+2
View File
@@ -5,6 +5,7 @@ INSERT INTO "resource"
"resource",
"namespace",
"name",
"folder",
"previous_resource_version",
"value",
"action"
@@ -15,6 +16,7 @@ INSERT INTO "resource"
'rr',
'nn',
'name',
'fldr',
123,
'[]',
'ADDED'
pkg/storage/unified/sql/testdata/sqlite--resource_list-filter_on_namespace.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ SELECT
"resource_version",
"namespace",
"name",
"folder",
"value"
FROM "resource"
WHERE 1 = 1
pkg/storage/unified/sql/testdata/sqlite--resource_read-without_resource_version.sql
Vendored
+5
View File
@@ -1,4 +1,9 @@
SELECT
"namespace",
"group",
"resource",
"name",
"folder",
"resource_version",
"value"
FROM "resource"
pkg/storage/unified/sql/testdata/sqlite--resource_update-single path.sql
Vendored
+1
View File
@@ -2,6 +2,7 @@ UPDATE "resource"
SET
"guid" = '',
"value" = '[]',
"folder" = 'fldr',
"action" = 'UNKNOWN'
WHERE 1 = 1
AND "group" = 'gg'