Use include when create index

AMagistroni · Sep 13, 2021 · c01dea8 · c01dea8
1 parent fff950c
commit c01dea8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/SqlSchemaCompare.Core/TSql/Factory/TSqlIndexFactory.cs b/SqlSchemaCompare.Core/TSql/Factory/TSqlIndexFactory.cs
@@ -11,14 +11,16 @@ public class TSqlIndexFactory : FactoryBase, IFactory
         public DbObject Create(ParserRuleContext context, ICharStream stream)
         {
             var indexContext = context as TSqlParser.Create_indexContext;
+            var columnsInclude = indexContext.column_name_list() != null ? indexContext.column_name_list().id_().Select(x => x.GetText()) : Enumerable.Empty<string>();
             return new Index
             {
                 Sql = stream.GetText(new Interval(context.start.StartIndex, context.stop.StopIndex)),
                 Name = indexContext.id_()[0].GetText(),
                 Schema = string.Empty,
                 Operation = GetOperation(indexContext.GetChild(0).GetText()),
                 ParentName = indexContext.table_name().GetText(),
-                ColumnNames = indexContext.column_name_list_with_order().id_().Select(x => x.GetText()),
+                ColumnNames = indexContext.column_name_list_with_order().id_().Select(x => x.GetText())
+                                .Union(columnsInclude)
             };
         }
     }

diff --git a/SqlSchemaCompare.Core/TSql/TSqlParserUpdateListener.cs b/SqlSchemaCompare.Core/TSql/TSqlParserUpdateListener.cs
@@ -121,16 +121,22 @@ public override void ExitCreate_type([NotNull] TSqlParser.Create_typeContext con
 
         public override void ExitCreate_index([NotNull] TSqlParser.Create_indexContext context)
         {
-            var index = _indexFactory.Create(context, _stream);
-            var table = DbObjects.OfType<Table>().Single(x => x.Identifier == index.ParentName);
-            table.AddIndex(index as DbStructures.Index);
+            if (!ObjectInsideDDL(context))
+            {
+                var index = _indexFactory.Create(context, _stream);
+                var table = DbObjects.OfType<Table>().Single(x => x.Identifier == index.ParentName);
+                table.AddIndex(index as DbStructures.Index);
+            }
         }
 
         public override void ExitAlter_table([NotNull] TSqlParser.Alter_tableContext context)
         {
-            var constraint = _tableFactory.CreateAlterTable(context);
-            var table = DbObjects.OfType<Table>().Single(x => x.Identifier == constraint.ParentName);
-            table.AddConstraint(constraint);
+            if (!ObjectInsideDDL(context))
+            {
+                var constraint = _tableFactory.CreateAlterTable(context);
+                var table = DbObjects.OfType<Table>().Single(x => x.Identifier == constraint.ParentName);
+                table.AddConstraint(constraint);
+            }
         }
 
         public override void ExitCreate_nonclustered_columnstore_index([NotNull] Create_nonclustered_columnstore_indexContext context)

diff --git a/SqlSchemaCompare.Test/TSql/TSqlIndexTest.cs b/SqlSchemaCompare.Test/TSql/TSqlIndexTest.cs
@@ -20,13 +20,13 @@ public TSqlIndexTest()
         public void CreateIndex()
         {
             const string sql =
-@"CREATE TABLE [dbo].[table] ([ID] [INT] NOT NULL)
+@"CREATE TABLE [dbo].[table] ([ID] [INT] NOT NULL, [col1] int )
 GO
 
 CREATE NONCLUSTERED INDEX [indexName] ON [dbo].[table]
 (
     [ID] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [indexTable]
+) INCLUDE ([col1]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [indexTable]
 GO";
 
             var objectFactory = new TSqlObjectFactory();
@@ -36,11 +36,14 @@ [ID] ASC
             table.Indexes.Single().Name.ShouldBe("[indexName]");
             table.Indexes.Single().Schema.ShouldBeEmpty();
             table.Indexes.Single().Identifier.ShouldBe("[indexName]");
+            table.Indexes.Single().ColumnNames.ShouldContain("[ID]");
+            table.Indexes.Single().ColumnNames.ShouldContain("[col1]");
+            table.Indexes.Single().ColumnNames.Count().ShouldBe(2);
             table.Indexes.Single().Sql.ShouldBe(
 @"CREATE NONCLUSTERED INDEX [indexName] ON [dbo].[table]
 (
     [ID] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [indexTable]");
+) INCLUDE ([col1]) WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [indexTable]");
             errors.Count().ShouldBe(0);
         }
 

diff --git a/SqlSchemaCompare.Test/TSql/TSqlTableTest.cs b/SqlSchemaCompare.Test/TSql/TSqlTableTest.cs
@@ -479,7 +479,7 @@ REFERENCES [dbo].[tblLookup] ([ID])
 ");
             errors.ShouldBeEmpty();
         }
-
+        
         [Fact]
         public void DropIndexBeforeAlterColumn()
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -479,7 +479,7 @@ REFERENCES [dbo].[tblLookup] ([ID]) @@
     ");
                 errors.ShouldBeEmpty();
             }
             [Fact]
             public void DropIndexBeforeAlterColumn()
             {
@@ Expand Down @@