merge changes

AFine-gs · Jan 10, 2024 · ac35733 · ac35733
1 parent 63f011b
commit ac35733
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...ionalStore-pure/src/main/resources/core_relational/relational/contract/storeContract.pure b/...ionalStore-pure/src/main/resources/core_relational/relational/contract/storeContract.pure
@@ -246,7 +246,7 @@ function meta::relational::contract::planExecution(sq:meta::pure::mapping::Store
                           ->generateExecutionNodeForPostProcessedResult($sq, $store, $ext, $m->toOne(), $storeRuntime, $exeCtx, $debug, $extensions);
       );
 
-   );
+
 }
 
 function meta::relational::contract::postProcessorsMatch(postProcessors1: meta::pure::alloy::connections::PostProcessor[*], postProcessors2: meta::pure::alloy::connections::PostProcessor[*]): Boolean[1]

diff --git a/...e-pure/src/main/resources/core_relational/relational/graphFetch/relationalGraphFetch.pure b/...e-pure/src/main/resources/core_relational/relational/graphFetch/relationalGraphFetch.pure
@@ -751,8 +751,6 @@ function <<access.private>> meta::relational::graphFetch::executionPlan::generat
 
 function <<access.private>> meta::relational::graphFetch::executionPlan::buildBaseQueryForChild(setImpls: RelationalInstanceSetImplementation[*], pureToSqlState: State[1], mc: TemporalMilestoningContext[0..1], extensions: Extension[*], debug: DebugContext[1]):SelectWithCursor[1]
 {
-   let isQualified    = $propTree.property->instanceOf(QualifiedProperty);
-   let pureToSqlState = defaultState($mapping, $inScopeVars, $exeCtx, $extensions);
    let srcSetImpl = $setImpls->match([
       s:RootRelationalInstanceSetImplementation[1]     | $s,
       s:EmbeddedRelationalInstanceSetImplementation[1] | $s.setMappingOwner;
@@ -778,7 +776,7 @@ function <<access.private>> meta::relational::graphFetch::executionPlan::buildBa
    );
 }
 
-function <<access.private>> meta::relational::graphFetch::executionPlan::generatePrimitivePropertyQuery(setImpls: RelationalInstanceSetImplementation[*], propTree: RoutedPropertyGraphFetchTree[1], parentTree: GraphFetchTree[1], mapping:Mapping[1], inScopeVars: Map<String, List<Any>>[1], mc: TemporalMilestoningContext[0..1], debug: DebugContext[1], extensions:Extension[*]):SelectSQLQuery[1]
+function <<access.private>> meta::relational::graphFetch::executionPlan::generatePrimitivePropertyQuery(setImpls: RelationalInstanceSetImplementation[*], propTree: RoutedPropertyGraphFetchTree[1], parentTree: GraphFetchTree[1], mapping:Mapping[1], inScopeVars: Map<String, List<Any>>[1], mc: TemporalMilestoningContext[0..1], debug: DebugContext[1], exeCtx : ExecutionContext[1], extensions:Extension[*]):SelectSQLQuery[1]
 {
    let isQualified    = $propTree.property->instanceOf(QualifiedProperty);
    let pureToSqlState = defaultState($mapping, $inScopeVars);

diff --git a/...ore-pure/src/main/resources/core_relational/relational/pureToSQLQuery/pureToSQLQuery.pure b/...ore-pure/src/main/resources/core_relational/relational/pureToSQLQuery/pureToSQLQuery.pure
@@ -284,7 +284,11 @@ function meta::relational::functions::pureToSqlQuery::defaultState(mapping:Mappi
    ^State(inScopeVars=$inScopeVars, supportedFunctions=getSupportedFunctions(), mapping=$mapping, inProject=false, inProjectFunctions=false, inFilter=false, filterChainDepth=0, processingProjectionThread=false, shouldIsolate=true, contextBasedSupportedFunctions=getContextBasedSupportedFunctions());
 }
 
-
+function meta::relational::functions::pureToSqlQuery::defaultState(mapping:Mapping[0..1], inScopeVars:Map<String, List<Any>>[1], exeCtx:meta::pure::runtime::ExecutionContext[0..1], extensions:Extension[*]):State[1]
+{
+  let map = if ($mapping->isEmpty(),|^Mapping(),|$mapping->toOne());
+  meta::relational::functions::pureToSqlQuery::defaultState($map,$inScopeVars, $exeCtx, $extensions);
+}
 
 function meta::relational::functions::pureToSqlQuery::defaultState(mapping:Mapping[1], inScopeVars:Map<String, List<Any>>[1], exeCtx:meta::pure::runtime::ExecutionContext[0..1], extensions:Extension[*]):State[1]
 {
-Original file line number
+Diff line change
@@ Expand Up @@
                               ->generateExecutionNodeForPostProcessedResult($sq, $store, $ext, $m->toOne(), $storeRuntime, $exeCtx, $debug, $extensions);
           );
-       );
     }
     function meta::relational::contract::postProcessorsMatch(postProcessors1: meta::pure::alloy::connections::PostProcessor[*], postProcessors2: meta::pure::alloy::connections::PostProcessor[*]): Boolean[1]
@@ Expand Down @@