- Method analyser removed.

Author: general-kroll-4-life

internal/stackql/drm/drm_cfg.go

@@ -431,7 +431,7 @@ func (dc *staticDRMConfig) getParserTableName(
 	}
 }
 
-func (dc *staticDRMConfig) inferColType(col util.Column) string {
+func (dc *staticDRMConfig) inferColType(col anysdk.Column) string {
 	schema := col.GetSchema()
 	return dc.inferColTypeFromSchema(schema)
 }
@@ -488,7 +488,6 @@ func (dc *staticDRMConfig) obtainAddressSpace(
 	if addressSpaceErr != nil {
 		return nil, addressSpaceErr
 	}
-	// TODO: use address space
 	addressSpace := addressSpaceFormulator.GetAddressSpace()
 	if addressSpace == nil {
 		return nil, fmt.Errorf("failed to obtain address space")

internal/stackql/primitivegenerator/unary_selection.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/stackql/any-sdk/anysdk"
+	"github.com/stackql/any-sdk/public/radix_tree_address_space"
 	"github.com/stackql/stackql/internal/stackql/astvisit"
 	"github.com/stackql/stackql/internal/stackql/docparser"
 	"github.com/stackql/stackql/internal/stackql/handler"
@@ -175,12 +176,45 @@ func (pb *standardPrimitiveGenerator) analyzeUnarySelection(
 	if itemObjS == nil {
 		return fmt.Errorf(unsuitableSchemaMsg)
 	}
+	resource, err := tbl.GetResource()
+	if err != nil {
+		return err
+	}
+	prov, err := tbl.GetProviderObject()
+	if err != nil {
+		return err
+	}
+	svc, err := tbl.GetService()
+	if err != nil {
+		return err
+	}
 	if len(cols) == 0 {
-		tsa := util.NewTableSchemaAnalyzer(schema, method, methodAnalysisOutput.IsNilResponseAllowed())
-		colz, localErr := tsa.GetColumns()
-		if localErr != nil {
-			return localErr
+		addressSpaceFormulator := radix_tree_address_space.NewAddressSpaceFormulator(
+			radix_tree_address_space.NewAddressSpaceGrammar(),
+			prov,
+			svc,
+			resource,
+			method,
+			method.GetProjections(),
+			methodAnalysisOutput.IsAwait(),
+		)
+		addressSpaceErr := addressSpaceFormulator.Formulate()
+		if addressSpaceErr != nil {
+			return addressSpaceErr
+		}
+		addressSpace := addressSpaceFormulator.GetAddressSpace()
+		if addressSpace == nil {
+			return fmt.Errorf("failed to obtain address space")
+		}
+		inferredRelation, inferredRelationErr := addressSpace.ToRelation(
+			radix_tree_address_space.NewStandardAddressSpaceExpansionConfig(
+				true, // TODO: switch this off at the appropriate time
+				false,
+			))
+		if inferredRelationErr != nil {
+			return inferredRelationErr
 		}
+		colz := inferredRelation.GetColumns()
 		for _, v := range colz {
 			cols = append(cols, parserutil.NewUnaliasedColumnHandle(v.GetName()))
 		}

internal/stackql/util/column.go

@@ -33,3 +33,11 @@ func MaxMapKey(numbers map[int]interface{}) int {
 	}
 	return maxNumber
 }
+
+func TrimSelectItemsKey(selectItemsKey string) string {
+	splitSet := strings.Split(selectItemsKey, "/")
+	if len(splitSet) == 0 {
+		return ""
+	}
+	return splitSet[len(splitSet)-1]
+}