Add CompiledValueTable to QsiDatainsertActionNode

chequer-io · Apr 12, 2024 · 12bf6ee · 12bf6ee
1 parent 2aeaf93
commit 12bf6ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Qsi.PostgreSql/Analyzers/PgActionAnalyzer.cs b/Qsi.PostgreSql/Analyzers/PgActionAnalyzer.cs
@@ -24,13 +24,13 @@ protected override ColumnTarget[] ResolveColumnTargetsFromDataInsertAction(IAnal
         if (!ListUtility.IsNullOrEmpty(action.Columns) || !ListUtility.IsNullOrEmpty(action.SetValues))
             return base.ResolveColumnTargetsFromDataInsertAction(context, table, action);
 
-        return ResolveColumnTargetsFromTable(context, table, (PgDerivedTableNode)action.ValueTable);
+        return ResolveColumnTargetsFromTable(context, table, ((QsiDataInsertActionNode)action).CompiledValueTable);
     }
 
-    protected ColumnTarget[] ResolveColumnTargetsFromTable(IAnalyzerContext context, QsiTableStructure table, PgDerivedTableNode valueTable)
+    protected ColumnTarget[] ResolveColumnTargetsFromTable(IAnalyzerContext context, QsiTableStructure table, QsiTableStructure valueTable)
     {
         return ResolveColumnTargetsFromTable(context, table)
-            .Take(valueTable.Columns.Value.Count)
+            .Take(valueTable.Columns.Count)
             .ToArray();
     }
 }
diff --git a/Qsi/Analyzers/Action/QsiActionAnalyzer.cs b/Qsi/Analyzers/Action/QsiActionAnalyzer.cs
@@ -463,6 +463,7 @@ protected virtual async ValueTask<IQsiAnalysisResult[]> ExecuteDataInsertAction(
         using (var tableContext = new TableCompileContext(context))
         {
             table = (await tableAnalyzer.BuildTableStructure(tableContext, action.Target)).CloneVisibleOnly();
+            ((QsiDataInsertActionNode)action).CompiledValueTable = (await tableAnalyzer.BuildTableStructure(tableContext, action.ValueTable)).CloneVisibleOnly();
         }
 
         ColumnTarget[] columnTargets = ResolveColumnTargetsFromDataInsertAction(context, table, action);

diff --git a/Qsi/Tree.Base/Actions/QsiDataInsertActionNode.cs b/Qsi/Tree.Base/Actions/QsiDataInsertActionNode.cs
@@ -21,6 +21,8 @@ public class QsiDataInsertActionNode : QsiActionNode, IQsiDataInsertActionNode
 
     public QsiTreeNodeProperty<QsiTableNode> ValueTable { get; }
 
+    public QsiTableStructure CompiledValueTable { get; set; }
+
     public QsiDataConflictBehavior ConflictBehavior { get; set; }
 
     public QsiTreeNodeProperty<QsiDataConflictActionNode> ConflictAction { get; }
@@ -54,4 +56,4 @@ public QsiDataInsertActionNode()
         ValueTable = new QsiTreeNodeProperty<QsiTableNode>(this);
         ConflictAction = new QsiTreeNodeProperty<QsiDataConflictActionNode>(this);
     }
-}
+}