Fix SQLite for compound primary keys

Author: Ja bist du narrisch

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

@@ -47,10 +47,11 @@ public void AddTable_CompositePrimaryKey_ContainsNull()
 
         // Assert
         var createScript = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript(tableName);
-        Assert.That("CREATE TABLE MyTableName (Column1 INTEGER NOT NULL, Column2 INTEGER NOT NULL, PRIMARY KEY (Column1,Column2) )", Is.EqualTo(createScript));
+        Assert.That("CREATE TABLE MyTableName (Column1 INTEGER NULL, Column2 INTEGER NOT NULL, PRIMARY KEY (Column1, Column2))", Is.EqualTo(createScript));
 
         var pragmaTableInfos = ((SQLiteTransformationProvider)Provider).GetPragmaTableInfoItems(tableName);
-        Assert.That(pragmaTableInfos.All(x => x.NotNull), Is.True);
+        Assert.That(pragmaTableInfos.Single(x => x.Name == columnName1).NotNull, Is.False);
+        Assert.That(pragmaTableInfos.Single(x => x.Name == columnName2).NotNull, Is.True);
 
         var sqliteInfo = ((SQLiteTransformationProvider)Provider).GetSQLiteTableInfo(tableName);
         Assert.That(sqliteInfo.Columns.First().Name, Is.EqualTo(columnName1));

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

@@ -70,14 +70,12 @@ public void GetColumns_PrimaryKeyOnTwoColumns_BothColumnsHavePrimaryKeyAndAreNot
             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 | ColumnProperty.Identity));
-        Assert.That(columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
+        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.Null));
+        Assert.That(columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.Null));
     }
 
     [Test]

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

@@ -0,0 +1,36 @@
+using System;
+using System.Data;
+using System.Linq;
+using DotNetProjects.Migrator.Providers.Impl.SQLite;
+using Migrator.Framework;
+using Migrator.Tests.Providers.SQLite.Base;
+using NUnit.Framework;
+
+namespace Migrator.Tests.Providers.SQLite;
+
+[TestFixture]
+[Category("SQLite")]
+public class SQLiteTransformationProvider_RecreateTableTests : SQLiteTransformationProviderTestBase
+{
+    [Test]
+    public void RecreateTable_HavingACompoundPrimaryKey_Success()
+    {
+        // Arrange
+        Provider.AddTable("Common_Availability_EvRef",
+            new Column("EventId", DbType.Int64, ColumnProperty.NotNull | ColumnProperty.PrimaryKey),
+            new Column("AvailabilityGroupId", DbType.Guid, ColumnProperty.NotNull | ColumnProperty.PrimaryKey));
+
+        var sqliteInfo = ((SQLiteTransformationProvider)Provider).GetSQLiteTableInfo("Common_Availability_EvRef");
+        var sql = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript("Common_Availability_EvRef");
+
+        // Act/Assert
+        ((SQLiteTransformationProvider)Provider).RecreateTable(sqliteInfo);
+        var sql2 = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript("Common_Availability_EvRef");
+
+
+        Assert.That(sql, Is.EqualTo("CREATE TABLE Common_Availability_EvRef (EventId INTEGER NOT NULL, AvailabilityGroupId UNIQUEIDENTIFIER NOT NULL, PRIMARY KEY (EventId, AvailabilityGroupId))"));
+
+        // The quotes around the table name are added by SQLite on ALTER TABLE in RecreateTable
+        Assert.That(sql2, Is.EqualTo("CREATE TABLE \"Common_Availability_EvRef\" (EventId INTEGER NOT NULL, AvailabilityGroupId UNIQUEIDENTIFIER NOT NULL, PRIMARY KEY (EventId, AvailabilityGroupId))"));
+    }
+}

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

@@ -1,3 +1,4 @@
+using System;
 using System.Data;
 using System.Linq;
 using DotNetProjects.Migrator.Providers.Impl.SQLite;

src/Migrator/Providers/Dialect.cs

@@ -363,6 +363,7 @@ public ColumnPropertiesMapper GetAndMapColumnProperties(Column column)
     {
         var mapper = GetColumnMapper(column);
         mapper.MapColumnProperties(column);
+
         if (column.DefaultValue != null && column.DefaultValue != DBNull.Value)
         {
             mapper.Default = column.DefaultValue;

src/Migrator/Providers/Impl/Mysql/MariaDBTransformationProvider.cs

@@ -1,4 +1,5 @@
 using System.Data;
+using DotNetProjects.Migrator.Providers.Impl.Mysql;
 
 namespace Migrator.Providers.Mysql;
 

src/Migrator/Providers/Impl/Mysql/MySqlTransformationProvider.cs

@@ -1,11 +1,12 @@
 using Migrator.Framework;
+using Migrator.Providers;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Globalization;
 using Index = Migrator.Framework.Index;
 
-namespace Migrator.Providers.Mysql;
+namespace DotNetProjects.Migrator.Providers.Impl.Mysql;
 
 /// <summary>
 /// MySql transformation provider

src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs

@@ -513,6 +513,11 @@ public override void RemoveColumn(string tableName, string column)
 
     public override void RenameColumn(string tableName, string oldColumnName, string newColumnName)
     {
+        if (!TableExists(tableName))
+        {
+            throw new Exception($"Table {tableName} does not exist");
+        }
+
         var isPragmaForeignKeysOn = IsPragmaForeignKeysOn();
 
         if (isPragmaForeignKeysOn)
@@ -578,15 +583,9 @@ public override void RenameColumn(string tableName, string oldColumnName, string
                     }
 
                     foreignKey.ParentColumns = foreignKey.ParentColumns.Select(x => x == oldColumnName ? newColumnName : x).ToArray();
-                }
 
-                RecreateTable(sqliteTableInfoOther);
-            }
-
-            // Rename column in index
-            foreach (var index in sqliteTableInfo.Indexes)
-            {
-                index.KeyColumns = index.KeyColumns.Select(x => x == oldColumnName ? newColumnName : x).ToArray();
+                    RecreateTable(sqliteTableInfoOther);
+                }
             }
         }
         else
@@ -700,7 +699,7 @@ public void SetPragmaForeignKeys(bool isOn)
         ExecuteQuery(cmd, $"PRAGMA foreign_keys = {onOffString}");
     }
 
-    private void RecreateTable(SQLiteTableInfo sqliteTableInfo)
+    public void RecreateTable(SQLiteTableInfo sqliteTableInfo)
     {
         var sourceTableQuoted = QuoteTableNameIfRequired(sqliteTableInfo.TableNameMapping.OldName);
         var targetIntermediateTableQuoted = QuoteTableNameIfRequired($"{sqliteTableInfo.TableNameMapping.NewName}{IntermediateTableSuffix}");
@@ -762,6 +761,7 @@ private void RecreateTable(SQLiteTableInfo sqliteTableInfo)
 
         using (var cmd = CreateCommand())
         {
+            // Rename to original name
             var sql = $"ALTER TABLE {targetIntermediateTableQuoted} RENAME TO {targetTableQuoted}";
             ExecuteQuery(cmd, sql);
         }
@@ -1013,7 +1013,9 @@ public override Column[] GetColumns(string tableName)
 
             var columnTableInfoItem = pragmaTableInfoItems.First(x => x.Name.Equals(column.Name, StringComparison.OrdinalIgnoreCase));
 
-            if (columnTableInfoItem.Type == "INTEGER" && columnTableInfoItem.Pk == 1)
+            var hasCompoundPrimaryKey = tableInfoPrimaryKeys.Count > 1;
+
+            if (columnTableInfoItem.Type == "INTEGER" && columnTableInfoItem.Pk == 1 && !hasCompoundPrimaryKey)
             {
                 column.ColumnProperty |= ColumnProperty.Identity;
             }
@@ -1088,17 +1090,19 @@ public override void AddTable(string name, string engine, params IDbField[] fiel
             .ToArray();
 
         var pks = GetPrimaryKeys(columns);
-        var compoundPrimaryKey = pks.Count > 1;
+        var hasCompoundPrimaryKey = pks.Count > 1;
 
         var columnProviders = new List<ColumnPropertiesMapper>(columns.Length);
 
         foreach (var column in columns)
         {
-            // Remove the primary key notation if compound primary key because we'll add it back later
-            if (compoundPrimaryKey && column.IsPrimaryKey)
+            if (hasCompoundPrimaryKey && column.IsPrimaryKey)
             {
-                column.ColumnProperty ^= ColumnProperty.PrimaryKey;
-                column.ColumnProperty |= ColumnProperty.NotNull; // PK is always not-null
+                // We remove PrimaryKey here and readd it as compound later ("...PRIMARY KEY(column1,column2)");
+                column.ColumnProperty &= ~ColumnProperty.PrimaryKey;
+
+                // AUTOINCREMENT cannot be used in compound primary keys in SQLite so we remove Identity here
+                column.ColumnProperty &= ~ColumnProperty.Identity;
             }
 
             var mapper = _dialect.GetAndMapColumnProperties(column);
@@ -1112,9 +1116,9 @@ public override void AddTable(string name, string engine, params IDbField[] fiel
 
         stringBuilder.Append(string.Format("CREATE TABLE {0} ({1}", table, columnsAndIndexes));
 
-        if (compoundPrimaryKey)
+        if (hasCompoundPrimaryKey)
         {
-            stringBuilder.Append(string.Format(", PRIMARY KEY ({0}) ", string.Join(",", pks.ToArray())));
+            stringBuilder.Append(string.Format(", PRIMARY KEY ({0})", string.Join(", ", pks.ToArray())));
         }
 
         var uniques = fields.Where(x => x is Unique).Cast<Unique>().ToArray();