- Unit tests pass.

Author: general-kroll-4-life

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.10.1
-	github.com/stackql/any-sdk v0.2.2-alpha16
+	github.com/stackql/any-sdk v0.2.2-alpha20
 	github.com/stackql/go-suffix-map v0.0.1-alpha01
 	github.com/stackql/psql-wire v0.1.1-beta23
 	github.com/stackql/stackql-parser v0.0.15-alpha06

go.sum

@@ -461,8 +461,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
 github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
-github.com/stackql/any-sdk v0.2.2-alpha16 h1:M+k6XyRfjzcQo7mXK59LlobNuFEYhg9KRRPHDC5tpC0=
-github.com/stackql/any-sdk v0.2.2-alpha16/go.mod h1:m1o5TCfyKkdt2bREB3itwPv1MhM+lk4eu24KpPohFoY=
+github.com/stackql/any-sdk v0.2.2-alpha20 h1:2IhyktdpUY4pcBJOPsU+YtFM6qZD8vfZGS4XBzkIUsQ=
+github.com/stackql/any-sdk v0.2.2-alpha20/go.mod h1:m1o5TCfyKkdt2bREB3itwPv1MhM+lk4eu24KpPohFoY=
 github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
 github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
 github.com/stackql/psql-wire v0.1.1-beta23 h1:1ayYMjZArfDcIMyEOKnm+Bp1zRCISw8pguvTFuUhhVQ=

internal/stackql/drm/drm_cfg.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/stackql/any-sdk/anysdk"
-	"github.com/stackql/any-sdk/pkg/client"
 	"github.com/stackql/any-sdk/pkg/constants"
 	"github.com/stackql/any-sdk/pkg/db/sqlcontrol"
 	"github.com/stackql/any-sdk/pkg/logging"
@@ -474,22 +473,8 @@ func (dc *staticDRMConfig) genRelationalTable(
 		tableName,
 		tabAnn.GetInputTableName(),
 	)
-	schemaAnalyzer := util.NewTableSchemaAnalyzer(tabAnn.GetTabulation().GetSchema(), m, isNilResponseAlloed)
-	tableColumns, err := schemaAnalyzer.GetColumns()
-	if err != nil {
-		return nil, err
-	}
-	for _, col := range tableColumns {
-		colName := col.GetName()
-		colType := dc.inferColType(col)
-		// relationalType := dc.GetRelationalType(colType)
-		// TODO: add drm logic to infer / transform width as suplied by openapi doc
-		colWidth := col.GetWidth()
-		relationalColumn := typing.NewRelationalColumn(colName, colType).WithWidth(colWidth)
-		relationalTable.PushBackColumn(relationalColumn)
-	}
-	protocolType, _ := prov.GetProtocolType()
-	if protocolType == client.HTTP {
+	addressSpace, hasAddressSpace := m.GetAddressSpace()
+	if !hasAddressSpace {
 		addressSpaceFormulator := radix_tree_address_space.NewAddressSpaceFormulator(
 			radix_tree_address_space.NewAddressSpaceGrammar(),
 			prov,
@@ -503,15 +488,29 @@ func (dc *staticDRMConfig) genRelationalTable(
 			return nil, addressSpaceErr
 		}
 		// TODO: use address space
-		addressSpace := addressSpaceFormulator.GetAddressSpace()
+		addressSpace = addressSpaceFormulator.GetAddressSpace()
 		if addressSpace == nil {
 			return nil, fmt.Errorf("failed to obtain address space")
 		}
 	}
-	// analyzer, analyzerErr := methodAnalyzerFactory.CreateMethodAggregateStaticAnalyzer(
-	// 	path.Join(dc.registryAPI.GetLocalProviderDocPath("", ""),
-
-	// )
+	inferredRelation, inferredRelationErr := addressSpace.ToRelation(
+		radix_tree_address_space.NewStandardAddressSpaceExpansionConfig(
+			true, // TODO: switch this off at the appropriate time
+			isNilResponseAlloed,
+		))
+	if inferredRelationErr != nil {
+		return nil, inferredRelationErr
+	}
+	tableColumns := inferredRelation.GetColumns()
+	for _, col := range tableColumns {
+		colName := col.GetName()
+		colType := dc.inferColType(col)
+		// relationalType := dc.GetRelationalType(colType)
+		// TODO: add drm logic to infer / transform width as suplied by openapi doc
+		colWidth := col.GetWidth()
+		relationalColumn := typing.NewRelationalColumn(colName, colType).WithWidth(colWidth)
+		relationalTable.PushBackColumn(relationalColumn)
+	}
 	return relationalTable, nil
 }
 
@@ -525,7 +524,8 @@ func (dc *staticDRMConfig) GenerateDDL(
 	dropTable bool,
 	isNilResponseAlloed bool,
 ) ([]string, error) {
-	relationalTable, err := dc.genRelationalTable(tabAnn, prov, svc, resource, m, discoveryGenerationID, isNilResponseAlloed)
+	relationalTable, err := dc.genRelationalTable(
+		tabAnn, prov, svc, resource, m, discoveryGenerationID, isNilResponseAlloed)
 	if err != nil {
 		return nil, err
 	}