Added include columns tests for SQL Server

Author: JaBistDuNarrisch

src/Migrator.Tests/Providers/SQLServer/SQLServerTransformationProvider_AddIndexTests.cs

@@ -1,9 +1,7 @@
-using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Threading.Tasks;
 using DotNetProjects.Migrator.Framework;
-using DotNetProjects.Migrator.Providers.Models.Indexes;
 using DotNetProjects.Migrator.Providers.Models.Indexes.Enums;
 using Migrator.Tests.Providers.Generic;
 using NUnit.Framework;
@@ -85,4 +83,64 @@ public void AddIndex_FilteredIndexGreaterOrEqualThanNumber_PartialIndexThrowsOnC
         Assert.That(index.Unique, Is.True);
         Assert.That(sqlException.Number, Is.EqualTo(2601));
     }
+
+    [Test]
+    public void AddIndex_IncludeColumnsSingle_Success()
+    {
+        // Arrange
+        const string tableName = "TestTable";
+        const string columnName = "TestColumn";
+        const string columnName2 = "TestColumn2";
+        const string indexName = "TestIndexName";
+
+        Provider.AddTable(tableName, new Column(columnName, DbType.Int32), new Column(columnName2, DbType.String));
+
+        // Act
+        Provider.AddIndex(tableName,
+            new Index
+            {
+                Name = indexName,
+                KeyColumns = [columnName],
+                Unique = true,
+                IncludeColumns = [columnName2]
+            });
+
+        // Assert
+        var index = Provider.GetIndexes(tableName).Single();
+
+        Assert.That(index.Unique, Is.True);
+        Assert.That(index.KeyColumns.Single, Is.EqualTo(columnName).IgnoreCase);
+        Assert.That(index.IncludeColumns.Single, Is.EqualTo(columnName2).IgnoreCase);
+    }
+
+    [Test]
+    public void AddIndex_IncludeColumnsMultiple_Success()
+    {
+        // Arrange
+        const string tableName = "TestTable";
+        const string columnName = "TestColumn";
+        const string columnName2 = "TestColumn2";
+        const string columnName3 = "TestColumn3";
+        const string indexName = "TestIndexName";
+
+        Provider.AddTable(tableName, new Column(columnName, DbType.Int32), new Column(columnName2, DbType.String), new Column(columnName3, DbType.Boolean));
+
+        // Act
+        Provider.AddIndex(tableName,
+            new Index
+            {
+                Name = indexName,
+                KeyColumns = [columnName],
+                Unique = true,
+                IncludeColumns = [columnName2, columnName3]
+            });
+
+        // Assert
+        var index = Provider.GetIndexes(tableName).Single();
+
+        Assert.That(index.Unique, Is.True);
+        Assert.That(index.KeyColumns.Single, Is.EqualTo(columnName).IgnoreCase);
+        Assert.That(index.IncludeColumns, Is.EquivalentTo([columnName2, columnName3])
+            .Using<string>((x, y) => string.Compare(x, y, ignoreCase: true)));
+    }
 }

src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs

@@ -149,6 +149,7 @@ public override void AddIndex(string table, Index index)
 
         var uniqueString = index.Unique ? "UNIQUE" : null;
         var columnsString = $"({string.Join(", ", columns)})";
+        var includeString = hasIncludedColumns ? $"INCLUDE ({string.Join(", ", index.IncludeColumns)})" : null;
         var filterString = string.Empty;
         var clusteredString = index.Clustered ? "CLUSTERED" : "NONCLUSTERED";
 
@@ -201,6 +202,7 @@ public override void AddIndex(string table, Index index)
         list.Add("ON");
         list.Add(table);
         list.Add(columnsString);
+        list.Add(includeString);
         list.Add(filterString);
 
         list = [.. list.Where(x => !string.IsNullOrWhiteSpace(x))];
@@ -334,7 +336,8 @@ ORDER BY
                 {
                     Clustered = reader.GetString(indexTypeOrdinal) == "CLUSTERED",
                     ColumnName = reader.GetString(columnNameOrdinal),
-                    FilterString = reader.GetString(filterDefinitionOrdinal),
+                    ColumnOrder = reader.GetInt32(columnOrderOrdinal),
+                    FilterString = !reader.IsDBNull(filterDefinitionOrdinal) ? reader.GetString(filterDefinitionOrdinal) : null,
                     IsFilteredIndex = reader.GetBoolean(isFilteredIndexOrdinal),
                     IsIncludedColumn = reader.GetBoolean(isIncludedColumnOrdinal),
                     Name = reader.GetString(indexNameOrdinal),