- All tests passing locally.

Author: general-kroll-4-life

.vscode/launch.json

@@ -181,6 +181,7 @@
         "select * from aws.iam.user_policies where region = 'us-east-1' and UserName = 'joe.blow' order by member asc;",
         "replace /*+ AWAIT */ google.compute.firewalls set data__disabled = 'true'  where project = 'mutable-project'  and firewall = 'replacable-firewall'  returning *;",
         "delete from aws.transfer.servers  where  data__ServerId = 's-0000000001'  and region = 'ap-southeast-2';",
+        "replace google.compute.firewalls set data__disabled = 'true'  where project = 'mutable-project'  and firewall = 'replacable-firewall'  returning *;",
       ], 
       "default": "show providers;"
     },

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-alpha26
+	github.com/stackql/any-sdk v0.2.2-alpha27
 	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-alpha26 h1:ydjW77NUX2yF4d6DbNa3OP53gOzHB1LUA0Qeb+r5LZk=
-github.com/stackql/any-sdk v0.2.2-alpha26/go.mod h1:m1o5TCfyKkdt2bREB3itwPv1MhM+lk4eu24KpPohFoY=
+github.com/stackql/any-sdk v0.2.2-alpha27 h1:wAScNhUh1OhyXfYTSAcE89txVd9dK5BaE0pEd3LDtWI=
+github.com/stackql/any-sdk v0.2.2-alpha27/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/dependencyplanner/dependencyplanner.go

@@ -408,7 +408,8 @@ func (dp *standardDependencyPlanner) processOrphan(
 	} else {
 		// Persist SQL mirror table here prior to generating insert DML
 		drmCfg := dp.handlerCtx.GetDrmConfig()
-		ddl, ddlErr := drmCfg.GenerateDDL(anTab, nil, nil, nil, opStore, 0, false, false)
+		// TODO: extract isAwait somehow
+		ddl, ddlErr := drmCfg.GenerateDDL(anTab, nil, nil, nil, opStore, false, 0, false, false)
 		if ddlErr != nil {
 			return nil, nil, ddlErr
 		}
@@ -570,6 +571,7 @@ func (dp *standardDependencyPlanner) processAcquire(
 		svc,
 		resource,
 		m,
+		false, // TODO: wire up isAwait
 		[]util.AnnotatedTabulation{anTab},
 		dp.primitiveComposer.GetSQLEngine(),
 		prov.GetName(),

internal/stackql/docparser/doc_parser.go

@@ -38,6 +38,7 @@ func OpenapiStackQLTabulationsPersistor(
 	svc anysdk.Service,
 	resource anysdk.Resource,
 	m anysdk.StandardOperationStore,
+	isAwait bool,
 	tabluationsAnnotated []util.AnnotatedTabulation,
 	dbEngine sqlengine.SQLEngine,
 	prefix string,
@@ -68,7 +69,7 @@ func OpenapiStackQLTabulationsPersistor(
 		return discoveryGenerationID, err
 	}
 	for _, tblt := range tabluationsAnnotated {
-		ddl, ddlErr := drmCfg.GenerateDDL(tblt, prov, svc, resource, m, discoveryGenerationID, false, true)
+		ddl, ddlErr := drmCfg.GenerateDDL(tblt, prov, svc, resource, m, isAwait, discoveryGenerationID, false, true)
 		if ddlErr != nil {
 			displayErr := fmt.Errorf("error generating DDL: %w", err)
 			logging.GetLogger().Infoln(displayErr.Error())

internal/stackql/drm/drm_cfg.go

@@ -48,7 +48,7 @@ type Config interface {
 	GetCurrentTable(internaldto.HeirarchyIdentifiers) (internaldto.DBTable, error)
 	GetRelationalType(string) string
 	GenerateDDL(util.AnnotatedTabulation, anysdk.Provider,
-		anysdk.Service, anysdk.Resource, anysdk.StandardOperationStore,
+		anysdk.Service, anysdk.Resource, anysdk.StandardOperationStore, bool,
 		int, bool, bool) ([]string, error)
 	GetControlAttributes() sqlcontrol.ControlAttributes
 	GetGolangValue(string) interface{}
@@ -457,6 +457,7 @@ func (dc *staticDRMConfig) genRelationalTable(
 	svc anysdk.Service,
 	resource anysdk.Resource,
 	m anysdk.StandardOperationStore,
+	isAwait bool,
 	discoveryGenerationID int,
 	isNilResponseAlloed bool,
 ) (relationaldto.RelationalTable, error) {
@@ -483,6 +484,7 @@ func (dc *staticDRMConfig) genRelationalTable(
 			resource,
 			m,
 			m.GetProjections(),
+			isAwait,
 		)
 		addressSpaceErr := addressSpaceFormulator.Formulate()
 		if addressSpaceErr != nil {
@@ -521,12 +523,13 @@ func (dc *staticDRMConfig) GenerateDDL(
 	svc anysdk.Service,
 	resource anysdk.Resource,
 	m anysdk.StandardOperationStore,
+	isAwait bool,
 	discoveryGenerationID int,
 	dropTable bool,
 	isNilResponseAlloed bool,
 ) ([]string, error) {
 	relationalTable, err := dc.genRelationalTable(
-		tabAnn, prov, svc, resource, m, discoveryGenerationID, isNilResponseAlloed)
+		tabAnn, prov, svc, resource, m, isAwait, discoveryGenerationID, isNilResponseAlloed)
 	if err != nil {
 		return nil, err
 	}

internal/stackql/primitivegenerator/unary_selection.go

@@ -58,6 +58,7 @@ func (pb *standardPrimitiveGenerator) assembleUnarySelectionBuilder(
 		svc,
 		resource,
 		method,
+		methodAnalysisOutput.IsAwait(),
 		[]util.AnnotatedTabulation{annotatedInsertTabulation},
 		pb.PrimitiveComposer.GetSQLEngine(),
 		prov.GetName(),

internal/stackql/router/obtain_context/obtain_context.go

@@ -22,7 +22,7 @@ func ObtainAnnotationCtx(
 	isPGInternalObject := tbl.GetHeirarchyObjects().IsPGInternalObject()
 	if isView || isSQLDataSource || isSubquery || isPGInternalObject {
 		// TODO: upgrade this flow; nil == YUCK!!!
-		return taxonomy.NewStaticStandardAnnotationCtx(nil, tbl.GetHeirarchyObjects().GetHeirarchyIDs(), tbl, parameters), nil
+		return taxonomy.NewStaticStandardAnnotationCtx(nil, tbl.GetHeirarchyObjects().GetHeirarchyIDs(), tbl, parameters, false), nil
 	}
 	schema, mediaType, err := tbl.GetResponseSchemaAndMediaType()
 	if err != nil {
@@ -57,5 +57,5 @@ func ObtainAnnotationCtx(
 	if isView {
 		hIDs = hIDs.WithView(viewDTO)
 	}
-	return taxonomy.NewStaticStandardAnnotationCtx(itemObjS, hIDs, tbl, parameters), nil
+	return taxonomy.NewStaticStandardAnnotationCtx(itemObjS, hIDs, tbl, parameters, false), nil
 }

internal/stackql/router/parameter_router.go

@@ -256,6 +256,7 @@ func (sp *standardParamSplitter) assembleSplitParams(
 			rawAnnotationCtx.GetHIDs(),
 			rawAnnotationCtx.GetTableMeta().Clone(),
 			com,
+			rawAnnotationCtx.IsAwait(),
 		)
 		sp.splitAnnotationContextMap.Put(rawAnnotationCtx, splitAnnotationCtx)
 		// TODO: this has gotta replace the original and also be duplicated

internal/stackql/taxonomy/annotation_context.go

@@ -24,6 +24,7 @@ type AnnotationCtx interface {
 	GetTableMeta() tablemetadata.ExtendedTableMetadata
 	Prepare(handlerCtx handler.HandlerContext, inStream streaming.MapStream) error
 	SetDynamic()
+	IsAwait() bool
 	Equals(AnnotationCtx) bool
 	Clone() AnnotationCtx
 }
@@ -34,23 +35,30 @@ type standardAnnotationCtx struct {
 	hIDs       internaldto.HeirarchyIdentifiers
 	tableMeta  tablemetadata.ExtendedTableMetadata
 	parameters map[string]interface{}
+	isAwait    bool
 }
 
 func NewStaticStandardAnnotationCtx(
 	schema anysdk.Schema,
 	hIDs internaldto.HeirarchyIdentifiers,
 	tableMeta tablemetadata.ExtendedTableMetadata,
 	parameters map[string]interface{},
+	isAwait bool,
 ) AnnotationCtx {
 	return &standardAnnotationCtx{
 		isDynamic:  false,
 		schema:     schema,
 		hIDs:       hIDs,
 		tableMeta:  tableMeta,
 		parameters: parameters,
+		isAwait:    isAwait,
 	}
 }
 
+func (ac *standardAnnotationCtx) IsAwait() bool {
+	return ac.isAwait
+}
+
 func (ac *standardAnnotationCtx) Equals(other AnnotationCtx) bool {
 	otherStandard, isStandard := other.(*standardAnnotationCtx)
 	if !isStandard {
@@ -59,6 +67,9 @@ func (ac *standardAnnotationCtx) Equals(other AnnotationCtx) bool {
 	if ac.isDynamic != otherStandard.isDynamic {
 		return false
 	}
+	if ac.isAwait != otherStandard.isAwait {
+		return false
+	}
 	if ac.schema != otherStandard.schema {
 		return false
 	}
@@ -101,6 +112,7 @@ func (ac *standardAnnotationCtx) Clone() AnnotationCtx {
 		hIDs:       ac.hIDs,
 		tableMeta:  ac.tableMeta.Clone(),
 		parameters: clonedParams,
+		isAwait:    ac.isAwait,
 	}
 }
 
@@ -129,8 +141,6 @@ func (ac *standardAnnotationCtx) Prepare(
 	if isSQLDataSource {
 		ac.tableMeta.SetSQLDataSource(sqlDataSource)
 		// TODO: persist mirror table here a la GenerateInsertDML()
-		// anTab := util.NewAnnotatedTabulation(tab, ac.GetHIDs(), inputTableName, annotationCtx.GetTableMeta().GetAlias())
-		// ddl, err := handlerCtx.GetDrmConfig().GenerateDDL(ac.tableMeta, nil, 0, false)
 		return nil
 	}
 	pr, err := ac.GetTableMeta().GetProvider()