Recalculate schema if requesting specific columns only

Fixes #207
MarkMpn · May 28, 2022 · 2432cb2 · 2432cb2
1 parent b4ea3e3
commit 2432cb2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/FetchXmlScan.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/FetchXmlScan.cs
@@ -91,6 +91,7 @@ public InvalidPagingException(string message) : base(message)
         private string _lastSchemaFetchXml;
         private string _lastSchemaAlias;
         private NodeSchema _lastSchema;
+        private bool _lastFullSchema;
         private bool _resetPage;
         private string _startingPage;
 
@@ -555,7 +556,7 @@ public override INodeSchema GetSchema(IDictionary<string, DataSource> dataSource
                 throw new NotSupportedQueryFragmentException("Missing datasource " + DataSource);
 
             var fetchXmlString = FetchXmlString;
-            if (_lastSchema != null && Alias == _lastSchemaAlias && fetchXmlString == _lastSchemaFetchXml)
+            if (_lastSchema != null && Alias == _lastSchemaAlias && fetchXmlString == _lastSchemaFetchXml && ReturnFullSchema == _lastFullSchema)
                 return _lastSchema;
 
             _primaryKeyColumns = new Dictionary<string, string>();
@@ -573,6 +574,7 @@ public override INodeSchema GetSchema(IDictionary<string, DataSource> dataSource
             _lastSchema = schema;
             _lastSchemaFetchXml = fetchXmlString;
             _lastSchemaAlias = Alias;
+            _lastFullSchema = ReturnFullSchema;
             return schema;
         }