Revert "UniStore: Add folder to the SQL backend" (#95966)

Revert "UniStore: Add folder to the SQL backend (#95671)"

This reverts commit f075662696.

pkg/storage/unified/sql/data/resource_history_insert.sql

@@ -5,7 +5,6 @@ INSERT INTO {{ .Ident "resource_history" }}
         {{ .Ident "resource" }},
         {{ .Ident "namespace" }},
         {{ .Ident "name" }},
-        {{ .Ident "folder" }},
 
         {{ .Ident "previous_resource_version"}},
         {{ .Ident "value" }},
@@ -18,7 +17,6 @@ INSERT INTO {{ .Ident "resource_history" }}
         {{ .Arg .WriteEvent.Key.Resource }},
         {{ .Arg .WriteEvent.Key.Namespace }},
         {{ .Arg .WriteEvent.Key.Name }},
-        {{ .Arg .Folder }},
 
         {{ .Arg .WriteEvent.PreviousRV }},
         {{ .Arg .WriteEvent.Value }},

pkg/storage/unified/sql/data/resource_history_list.sql

@@ -2,7 +2,6 @@ SELECT
     kv.{{ .Ident "resource_version" }},
     kv.{{ .Ident "namespace" }},
     kv.{{ .Ident "name" }},
-    kv.{{ .Ident "folder" }},
     kv.{{ .Ident "value" }}
     FROM {{ .Ident "resource_history" }} as kv 
     INNER JOIN  (

pkg/storage/unified/sql/data/resource_history_poll.sql

@@ -4,7 +4,6 @@ SELECT
     {{ .Ident "group" | .Into .Response.Key.Group }},
     {{ .Ident "resource" | .Into .Response.Key.Resource }},
     {{ .Ident "name" | .Into .Response.Key.Name }},
-    {{ .Ident "folder" | .Into .Response.Folder }},
     {{ .Ident "value" | .Into .Response.Value }},
     {{ .Ident "action" | .Into .Response.Action }},
     {{ .Ident "previous_resource_version" | .Into .Response.PreviousRV }}

pkg/storage/unified/sql/data/resource_history_read.sql

@@ -1,11 +1,6 @@
 SELECT
-    {{ .Ident "namespace" | .Into .Response.Key.Namespace }},
-    {{ .Ident "group" | .Into .Response.Key.Group }},
-    {{ .Ident "resource" | .Into .Response.Key.Resource }},
-    {{ .Ident "name" | .Into .Response.Key.Name }},
-    {{ .Ident "folder" | .Into .Response.Folder }},
-    {{ .Ident "resource_version" | .Into .Response.ResourceVersion }},
-    {{ .Ident "value" | .Into .Response.Value }}
+    {{ .Ident "resource_version" | .Into .ResourceVersion }},
+    {{ .Ident "value" | .Into .Value }}
 
     FROM {{ .Ident "resource_history" }}
 

pkg/storage/unified/sql/data/resource_insert.sql

@@ -6,7 +6,6 @@ INSERT INTO {{ .Ident "resource" }}
         {{ .Ident "resource" }},
         {{ .Ident "namespace" }},
         {{ .Ident "name" }},
-        {{ .Ident "folder" }},
 
         {{ .Ident "previous_resource_version" }},
         {{ .Ident "value" }},
@@ -18,7 +17,6 @@ INSERT INTO {{ .Ident "resource" }}
         {{ .Arg .WriteEvent.Key.Resource }},
         {{ .Arg .WriteEvent.Key.Namespace }},
         {{ .Arg .WriteEvent.Key.Name }},
-        {{ .Arg .Folder }},
 
         {{ .Arg .WriteEvent.PreviousRV }},
         {{ .Arg .WriteEvent.Value }},

pkg/storage/unified/sql/data/resource_list.sql

@@ -2,7 +2,6 @@ SELECT
     {{ .Ident "resource_version" }},
     {{ .Ident "namespace" }},
     {{ .Ident "name" }},
-    {{ .Ident "folder" }},
     {{ .Ident "value" }}
     FROM {{ .Ident "resource" }}
     WHERE 1 = 1

pkg/storage/unified/sql/data/resource_read.sql

@@ -1,11 +1,6 @@
 SELECT
-    {{ .Ident "namespace" | .Into .Response.Key.Namespace }},
-    {{ .Ident "group" | .Into .Response.Key.Group }},
-    {{ .Ident "resource" | .Into .Response.Key.Resource }},
-    {{ .Ident "name" | .Into .Response.Key.Name }},
-    {{ .Ident "folder" | .Into .Response.Folder }},
-    {{ .Ident "resource_version" | .Into .Response.ResourceVersion }},
-    {{ .Ident "value" | .Into .Response.Value }}
+    {{ .Ident "resource_version" | .Into .ResourceVersion }},
+    {{ .Ident "value" | .Into .Value }}
     FROM {{ .Ident "resource" }}
     WHERE 1 = 1
         AND {{ .Ident "namespace" }} = {{ .Arg .Request.Key.Namespace }}

pkg/storage/unified/sql/data/resource_update.sql

@@ -2,7 +2,6 @@ UPDATE {{ .Ident "resource" }}
     SET
         {{ .Ident "guid" }}   = {{ .Arg .GUID }},
         {{ .Ident "value" }}  = {{ .Arg .WriteEvent.Value }},
-        {{ .Ident "folder" }}  = {{ .Arg .Folder }},
         {{ .Ident "action" }} = {{ .Arg .WriteEvent.Type }}  
     WHERE 1 = 1
         AND {{ .Ident "group" }}     = {{ .Arg .WriteEvent.Key.Group }}