Mark IExternalDataSource as mutable if applicable

microsoft · Mar 7, 2024 · 74e2b41 · 74e2b41
1 parent 7287db1
commit 74e2b41
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs
@@ -2873,16 +2873,9 @@ public override void Visit(FirstNameNode node)
                         isConstantNamedFormula = formula.IsConstant;
                     }
                 }
-                else if (lookupInfo.Kind == BindKind.Data)
+                else if (lookupInfo.Data is IExternalDataSource ds)
                 {
-                    if (lookupInfo.Data is IExternalCdsDataSource or IExternalTabularDataSource)
-                    {
-                        _txb.SetMutable(node, true);
-                    }
-                }
-                else if (lookupInfo.Kind == BindKind.ScopeCollection)
-                {
-                    _txb.SetMutable(node, true);
+                    _txb.SetMutable(node, ds.IsWritable);
                 }
 
                 Contracts.Assert(lookupInfo.Kind != BindKind.LambdaField);

diff --git a/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalDataSource.cs b/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalDataSource.cs
@@ -18,6 +18,8 @@ internal interface IExternalDataSource : IExternalEntity, IExternalPageableSymbo
         bool IsRefreshable { get; }
 
         bool RequiresAsync { get; }
+
+        bool IsWritable { get; }
 
         IExternalDataEntityMetadataProvider DataEntityMetadataProvider { get; }
 

diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/AssociatedDataSourcesTests/TestDVEntity.cs b/src/tests/Microsoft.PowerFx.Core.Tests/AssociatedDataSourcesTests/TestDVEntity.cs
@@ -29,6 +29,8 @@ public class AccountsEntity : IExternalEntity, IExternalDataSource
 
         public bool IsPageable => true;
 
+        public bool IsWritable => true;
+
         DType IExternalEntity.Type => AccountsTypeHelper.GetDType();
 
         IExternalDataEntityMetadataProvider IExternalDataSource.DataEntityMetadataProvider => throw new NotImplementedException();

diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/Helpers/TestTabularDataSource.cs b/src/tests/Microsoft.PowerFx.Core.Tests/Helpers/TestTabularDataSource.cs
@@ -218,6 +218,8 @@ internal TestDataSource(string name, DType schema, string[] keyColumns = null, I
 
         IDelegationMetadata IExternalDataSource.DelegationMetadata => DelegationMetadata;
 
+        public bool IsWritable => throw new NotImplementedException();
+
         public bool CanIncludeExpand(IExpandInfo expandToAdd)
         {
             throw new NotImplementedException();