Ensure complex accessors from schema don't result in double-bracketing. (#531)

ericpromislow · web-flow · commit 2f331b1a1aa2 · 2025-03-04T09:52:35.000-08:00
diff --git a/pkg/stores/sqlproxy/proxy_store.go b/pkg/stores/sqlproxy/proxy_store.go
@@ -15,6 +15,7 @@ import (
 	"sync"
 
 	"github.com/pkg/errors"
+	"github.com/rancher/steve/pkg/stores/queryhelper"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 	"k8s.io/apimachinery/pkg/api/meta"
@@ -371,7 +372,7 @@ func getFieldsFromSchema(schema *types.APISchema) [][]string {
 	}
 	for _, colDef := range colDefs {
 		field := strings.TrimPrefix(colDef.Field, "$.")
-		fields = append(fields, strings.Split(field, "."))
+		fields = append(fields, queryhelper.SafeSplit(field))
 	}
 	return fields
 }

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import (`
`15`	`15`	`"sync"`
`16`	`16`
`17`	`17`	`"github.com/pkg/errors"`
	`18`	`+ "github.com/rancher/steve/pkg/stores/queryhelper"`
`18`	`19`	`"github.com/sirupsen/logrus"`
`19`	`20`	`"golang.org/x/sync/errgroup"`
`20`	`21`	`"k8s.io/apimachinery/pkg/api/meta"`
`@@ -371,7 +372,7 @@ func getFieldsFromSchema(schema *types.APISchema) [][]string {`
`371`	`372`	`}`
`372`	`373`	`for _, colDef := range colDefs {`
`373`	`374`	`field := strings.TrimPrefix(colDef.Field, "$.")`
`374`		`- fields = append(fields, strings.Split(field, "."))`
	`375`	`+ fields = append(fields, queryhelper.SafeSplit(field))`
`375`	`376`	`}`
`376`	`377`	`return fields`
`377`	`378`	`}`