Unitstore: Fix the Folder migration (#96078)

* UniStore: Add folder to the SQL backend

This reverts commit aaa4f4a23e.

* fix folder migration

pkg/storage/unified/sql/queries.go

@@ -64,6 +64,7 @@ type sqlResourceRequest struct {
 	sqltemplate.SQLTemplate
 	GUID       string
 	WriteEvent resource.WriteEvent
+	Folder     string
 }
 
 func (r sqlResourceRequest) Validate() error {
@@ -76,6 +77,7 @@ type historyPollResponse struct {
 	PreviousRV      *int64
 	Value           []byte
 	Action          int
+	Folder          string
 }
 
 func (r *historyPollResponse) Results() (*historyPollResponse, error) {
@@ -108,6 +110,7 @@ func (r *sqlResourceHistoryPollRequest) Results() (*historyPollResponse, error)
 			Resource:  r.Response.Key.Resource,
 			Name:      r.Response.Key.Name,
 		},
+		Folder:          r.Response.Folder,
 		ResourceVersion: r.Response.ResourceVersion,
 		PreviousRV:      prevRV,
 		Value:           r.Response.Value,
@@ -116,33 +119,24 @@ func (r *sqlResourceHistoryPollRequest) Results() (*historyPollResponse, error)
 }
 
 // sqlResourceReadRequest can be used to retrieve a row fromthe "resource" tables.
-
-type readResponse struct {
-	resource.ReadResponse
-}
-
-func (r *readResponse) Results() (*readResponse, error) {
-	return r, nil
+func NewReadResponse() *resource.BackendReadResponse {
+	return &resource.BackendReadResponse{
+		Key: &resource.ResourceKey{},
+	}
 }
 
 type sqlResourceReadRequest struct {
 	sqltemplate.SQLTemplate
-	Request *resource.ReadRequest
-	*readResponse
+	Request  *resource.ReadRequest
+	Response *resource.BackendReadResponse
 }
 
 func (r *sqlResourceReadRequest) Validate() error {
 	return nil // TODO
 }
 
-func (r *sqlResourceReadRequest) Results() (*readResponse, error) {
-	return &readResponse{
-		ReadResponse: resource.ReadResponse{
-			Error:           r.ReadResponse.Error,
-			ResourceVersion: r.ReadResponse.ResourceVersion,
-			Value:           r.ReadResponse.Value,
-		},
-	}, nil
+func (r *sqlResourceReadRequest) Results() (*resource.BackendReadResponse, error) {
+	return r.Response, nil
 }
 
 // List
@@ -157,6 +151,7 @@ func (r sqlResourceListRequest) Validate() error {
 
 type historyListRequest struct {
 	ResourceVersion, Limit, Offset int64
+	Folder                         string
 	Options                        *resource.ListOptions
 }
 type sqlResourceHistoryListRequest struct {