Index handling (on recreation of tables, SQLiteInfo, unique)

Author: Ja bist du narrisch

src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs

@@ -1,4 +1,8 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using DotNetProjects.Migrator.Providers.Impl.SQLite;
+using Migrator.Framework;
 using Migrator.Providers.SQLite;
 using Migrator.Tests.Settings;
 using NUnit.Framework;

src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderTests.cs

@@ -4,6 +4,7 @@
 using Migrator.Framework;
 using Migrator.Tests.Providers.SQLite.Base;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Migrator.Tests.Providers.SQLite;
 
@@ -95,32 +96,33 @@ public void AddTable_AddingColumnPropertyUnique_AddsUniqe()
     {
         // Arrange
         var testTableName = "MyDefaultTestTable";
+        var propertyName1 = "Color1";
+        var propertyName2 = "Color2";
+        var indexName = "MyIndexName";
 
         _provider.AddTable(testTableName,
-            new Column("Color", DbType.Int32, ColumnProperty.Unique)
+            new Column(propertyName1, DbType.Int32, ColumnProperty.Unique),
+            new Column(propertyName2, DbType.Int32)
         );
 
+        _provider.AddIndex(indexName, testTableName, [propertyName1, propertyName2]);
         var tableInfoBefore = ((SQLiteTransformationProvider)_provider).GetSQLiteTableInfo(testTableName);
 
-        // Act
-
-        // TODO In progress
-
-        // _provider.AddPrimaryKey("MyPrimaryKeyName", testTableName, "Id", "Color");
+        _provider.ExecuteNonQuery($"INSERT INTO {testTableName} ({propertyName1}, {propertyName2}) VALUES (1, 2)");
 
-        // // Assert
-        // Assert.That(tableInfoBefore.Columns.Single(x => x.Name == "Id").ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
-        // Assert.That(tableInfoBefore.Columns.Single(x => x.Name == "Color").ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
-        // Assert.That(tableInfoBefore.Columns.Single(x => x.Name == "NotAPrimaryKey").ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
+        // Act
+        ((SQLiteTransformationProvider)_provider).AddPrimaryKey("MyPrimaryKeyName", testTableName, [propertyName1]);
 
-        // var tableInfoAfter = ((SQLiteTransformationProvider)_provider).GetSQLiteTableInfo(testTableName);
-        // var tableNames = ((SQLiteTransformationProvider)_provider).GetTables();
+        // Assert
+        var tableInfoAfter = ((SQLiteTransformationProvider)_provider).GetSQLiteTableInfo(testTableName);
 
-        // Assert.That(tableInfoAfter.Columns.Single(x => x.Name == "Id").ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.True);
-        // Assert.That(tableInfoAfter.Columns.Single(x => x.Name == "Color").ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.True);
-        // Assert.That(tableInfoAfter.Columns.Single(x => x.Name == "NotAPrimaryKey").ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
+        Assert.That(tableInfoBefore.Columns.Single(x => x.Name == propertyName1).ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
+        Assert.That(tableInfoBefore.Columns.Single(x => x.Name == propertyName2).ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
+        Assert.That(tableInfoAfter.Columns.Single(x => x.Name == propertyName1).ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.True);
+        Assert.That(tableInfoAfter.Columns.Single(x => x.Name == propertyName2).ColumnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
 
-        // // Check for intermediate table residues.
-        // Assert.That(tableNames.Where(x => x.Contains(testTableName)), Has.Exactly(1).Items);
+        var indexAfter = tableInfoAfter.Indexes.Single();
+        Assert.That(indexAfter.Name, Is.EqualTo(indexName));
+        CollectionAssert.AreEquivalent(indexAfter.KeyColumns, new string[] { propertyName1, propertyName2 });
     }
 }

src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs

@@ -1,4 +1,4 @@
-using DotNetProjects.Migrator.Framework;
+using System.Linq;
 using DotNetProjects.Migrator.Providers.Impl.SQLite;
 using Migrator.Framework;
 using Migrator.Tests.Providers.SQLite.Base;
@@ -11,17 +11,123 @@ namespace Migrator.Tests.Providers.SQLite;
 public class SQLiteTransformationProvider_GetColumnsTests : SQLiteTransformationProviderTestBase
 {
     [Test]
-    public void CheckForeignKeyIntegrity_IntegrityViolated_ReturnsFalse()
+    public void GetColumns_UniqueButNotPrimaryKey_ReturnsFalse()
     {
+        // Arrange
         const string tableName = "GetColumnsTest";
+        _provider.AddTable(tableName, new Column("Id", System.Data.DbType.Int32, ColumnProperty.Unique));
+
+        // Act
+        var columns = _provider.GetColumns(tableName);
 
+        // Assert
+        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(ColumnProperty.Null | ColumnProperty.Unique));
+    }
+
+    [Test]
+    public void GetColumns_PrimaryAndUnique_ReturnsFalse()
+    {
         // Arrange
-        _provider.AddTable(tableName, new Column("Id", System.Data.DbType.Int32, ColumnProperty.Unique));
+        const string tableName = "GetColumnsTest";
+        _provider.AddTable(tableName, new Column("Id", System.Data.DbType.Int32, ColumnProperty.Unique | ColumnProperty.PrimaryKey));
+
+        // Act
+        var columns = _provider.GetColumns(tableName);
+
+        // Assert
+        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(
+            ColumnProperty.Null |
+            ColumnProperty.Unique |
+            ColumnProperty.PrimaryKey));
+    }
+
+    [Test]
+    public void GetColumns_Primary_ColumnPropertyOk()
+    {
+        // Arrange
+        const string tableName = "GetColumnsTest";
+        _provider.AddTable(tableName, new Column("Id", System.Data.DbType.Int32, ColumnProperty.PrimaryKey));
+        _provider.GetColumns(tableName);
+
+        // Act
+        var columns = _provider.GetColumns(tableName);
+
+        // Assert
+        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(
+            ColumnProperty.Null |
+            ColumnProperty.PrimaryKey));
+    }
+
+    [Test]
+    public void GetColumns_PrimaryKey_ContainsPrimaryKey()
+    {
+        // Arrange
+        const string tableName = "GetColumnsTest";
+        _provider.AddTable(tableName, new Column("Id", System.Data.DbType.Int32, ColumnProperty.PrimaryKey));
+
+        _provider.GetColumns(tableName);
+
+        // Act
+        var columns = _provider.GetColumns(tableName);
+
+        // Assert
+        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(
+            ColumnProperty.Null |
+            ColumnProperty.PrimaryKey));
+    }
+
+    [Test]
+    public void GetColumns_PrimaryKeyOnTwoColumns_BothColumnsHavePrimaryKeyAndAreNotNull()
+    {
+        // Arrange
+        const string tableName = "GetColumnsTest";
+
+        _provider.AddTable(tableName,
+            new Column("Id", System.Data.DbType.Int32, ColumnProperty.PrimaryKey),
+            new Column("Id2", System.Data.DbType.Int32, ColumnProperty.PrimaryKey)
+        );
+
+        _provider.GetColumns(tableName);
+
+        // Act
+        var columns = _provider.GetColumns(tableName);
+
+        // Assert
+        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
+        Assert.That(columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
+    }
+
+    [Test]
+    public void GetColumns_AddUniqueWithTwoColumns_NoUniqueOnColumnLevel()
+    {
+        // Arrange
+        const string tableName = "GetColumnsTest";
+        _provider.AddTable(tableName, new Column("Bla1", System.Data.DbType.Int32), new Column("Bla2", System.Data.DbType.Int32));
+
+        _provider.AddUniqueConstraint("Index name not used in SQLite", tableName, "Bla1, Bla2");
 
         // Act
         var columns = _provider.GetColumns(tableName);
 
         // Assert
+        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.Null));
+    }
+
+    [Test, Description("Add index. Should be added and detected as index")]
+    public void GetSQLiteTableInfo_GetIndexesAndColumnsWithIndex_NoUniqueOnTheColumnsAndIndexExists()
+    {
+        // Arrange
+        const string tableName = "GetColumnsTest";
+        _provider.AddTable(tableName, new Column("Bla1", System.Data.DbType.Int32), new Column("Bla2", System.Data.DbType.Int32));
+        _provider.AddIndex("IndexName", tableName, ["Bla1", "Bla2"]);
+
+        // Act
+        var sqliteInfo = ((SQLiteTransformationProvider)_provider).GetSQLiteTableInfo(tableName);
 
+        // Assert
+        Assert.That(sqliteInfo.Columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.Null));
+        Assert.That(sqliteInfo.Columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.Null));
+        Assert.That(sqliteInfo.Uniques, Is.Empty);
+        Assert.That(sqliteInfo.Indexes.Single().Unique, Is.False);
     }
 }

src/Migrator/Framework/ColumnProperty.cs

@@ -9,26 +9,32 @@ namespace Migrator.Framework
     public enum ColumnProperty
     {
         None = 0,
+
         /// <summary>
         /// Null is allowable
         /// </summary>
         Null = 1,
+
         /// <summary>
         /// Null is not allowable
         /// </summary>
         NotNull = 2,
+
         /// <summary>
         /// Identity column, autoinc
         /// </summary>
         Identity = 4,
+
         /// <summary>
         /// Unique Column
         /// </summary>
         Unique = 8,
+
         /// <summary>
         /// Indexed Column
         /// </summary>
         Indexed = 16,
+
         /// <summary>
         /// Unsigned Column
         /// </summary>
@@ -39,14 +45,17 @@ public enum ColumnProperty
         /// Foreign Key
         /// </summary>
         ForeignKey = Unsigned | Null,
+
         /// <summary>
         /// Primary Key
         /// </summary>
         PrimaryKey = 128 | Unsigned | NotNull,
+
         /// <summary>
         /// Primary key. Make the column a PrimaryKey and unsigned
         /// </summary>
         PrimaryKeyWithIdentity = PrimaryKey | Identity,
+
         /// <summary>
         /// Primary key. Make the column a PrimaryKey and unsigned
         /// </summary>

src/Migrator/Providers/Impl/SQLite/Models/PragmaTableInfoItem.cs

@@ -23,9 +23,9 @@ public class PragmaTableInfoItem
     public bool NotNull { get; set; }
 
     /// <summary>
-    /// Gets or sets the default value as SQL or NULL
+    /// Gets or sets the default value or NULL
     /// </summary>
-    public string DfltValue { get; set; }
+    public object DfltValue { get; set; }
 
     /// <summary>
     /// Gets or set the position in the primary key (1-based) 0 if not part of the primary key.