Fix folder management

microsoft · Oct 23, 2023 · bef11cb · bef11cb
1 parent 1b34f23
commit bef11cb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/code/DeltaKustoLib/KustoModel/TableModel.cs b/code/DeltaKustoLib/KustoModel/TableModel.cs
@@ -359,30 +359,30 @@ private IEnumerable<CommandBase> ComputeDelta(TableModel targetModel)
             var ingestionBatchingPolicyCommands = AlterIngestionBatchingPolicyCommand.ComputeDelta(
                 IngestionBatchingPolicy,
                 targetModel.IngestionBatchingPolicy);
+            var ingestionTimePolicyCommands = AlterIngestionTimePolicyCommand.ComputeDelta(
+                IngestionTimePolicy,
+                targetModel.IngestionTimePolicy);
             var mergePolicyCommands = AlterMergePolicyCommand.ComputeDelta(
                 MergePolicy,
                 targetModel.MergePolicy);
+            var partitioningPolicyCommands = AlterPartitioningPolicyCommand.ComputeDelta(
+                PartitioningPolicy,
+                targetModel.PartitioningPolicy);
             var retentionPolicyCommands = AlterRetentionPolicyCommand.ComputeDelta(
                 RetentionPolicy,
                 targetModel.RetentionPolicy);
+            var restrictedViewPolicyCommands = AlterRestrictedViewPolicyCommand.ComputeDelta(
+                RestrictedViewPolicy,
+                targetModel.RestrictedViewPolicy);
+            var rowLevelSecurityPolicyCommands = AlterRowLevelSecurityPolicyCommand.ComputeDelta(
+                RowLevelSecurityPolicy,
+                targetModel.RowLevelSecurityPolicy);
             var shardingPolicyCommands = AlterShardingPolicyCommand.ComputeDelta(
                 ShardingPolicy,
                 targetModel.ShardingPolicy);
             var streamingIngestionPolicyCommands = AlterStreamingIngestionPolicyCommand.ComputeDelta(
                 StreamingIngestionPolicy,
                 targetModel.StreamingIngestionPolicy);
-            var partitioningPolicyCommands = AlterPartitioningPolicyCommand.ComputeDelta(
-                PartitioningPolicy,
-                targetModel.PartitioningPolicy);
-            var rowLevelSecurityPolicyCommands = AlterRowLevelSecurityPolicyCommand.ComputeDelta(
-                RowLevelSecurityPolicy,
-                targetModel.RowLevelSecurityPolicy);
-            var ingestionTimePolicyCommands = AlterIngestionTimePolicyCommand.ComputeDelta(
-                IngestionTimePolicy,
-                targetModel.IngestionTimePolicy);
-            var restrictedViewPolicyCommands = AlterRestrictedViewPolicyCommand.ComputeDelta(
-                RestrictedViewPolicy,
-                targetModel.RestrictedViewPolicy);
             var updatePolicyCommands =
                 AlterUpdatePolicyCommand.ComputeDelta(UpdatePolicy, targetModel.UpdatePolicy);
 
@@ -398,10 +398,8 @@ private IEnumerable<CommandBase> ComputeDelta(TableModel targetModel)
                     TableName,
                     targetModel.Columns.Select(
                         c => new TableColumn(c.ColumnName, c.PrimitiveType)),
-                    includeFolder ? (targetModel.Folder ?? QuotedText.Empty) : null,
-                    includeDocString
-                    ? (targetModel.DocString ?? QuotedText.Empty)
-                    : null);
+                    targetModel.Folder,
+                    targetModel.DocString);
             }
             if (updateDocStringColumnNames.Any())
             {

diff --git a/code/DeltaKustoUnitTest/Delta/DeltaTableTest.cs b/code/DeltaKustoUnitTest/Delta/DeltaTableTest.cs
@@ -82,8 +82,6 @@ public void AddingFolder()
             var createTableCommand = (CreateTableCommand)delta[0];
 
             Assert.Equal(new QuotedText("abc"), createTableCommand.Folder);
-            //  This hasn't changed so it shouldn't be part of the command
-            Assert.Null(createTableCommand.DocString);
         }
 
         [Fact]
@@ -100,7 +98,6 @@ public void RemovingDocString()
 
             var createTableCommand = (CreateTableCommand)delta[0];
 
-            Assert.Null(createTableCommand.Folder);
             Assert.Equal(createTableCommand.DocString, QuotedText.Empty);
         }