Updated Primary Key behaviour

Author: JaBistDuNarrisch

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

@@ -60,7 +60,7 @@ public void AddColumn_HavingColumnPropertyUniqueAndIndex_RebuildSucceeds()
     }
 
     [Test]
-    public void AddColumn_HavingNullInPrimaryKey_Succeds()
+    public void AddColumn_HavingNullInPrimaryKey_HasNULLAfterAddAnotherColumn()
     {
         // Arrange/Act
         Provider.ExecuteNonQuery("CREATE TABLE Common_Language (LanguageID TEXT PRIMARY KEY)");
@@ -71,10 +71,26 @@ public void AddColumn_HavingNullInPrimaryKey_Succeds()
         var script = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript("Common_Language");
 
         var columnProperty = tableInfo.Columns.Single(x => x.Name == "LanguageID").ColumnProperty;
-        var hasNull = columnProperty.IsSet(ColumnProperty.Null);
 
         // Assert        
-        Assert.That(hasNull, Is.False);
+        Assert.That(script, Does.Contain("LanguageID TEXT NULL PRIMARY KEY"));
+    }
+
+    [Test]
+    public void AddColumn_HavingNullInPrimaryKey_HasNOTNULLAfterAddAnotherColumn()
+    {
+        // Arrange/Act
+        Provider.ExecuteNonQuery("CREATE TABLE Common_Language (LanguageID TEXT NOT NULL PRIMARY KEY)");
+
+        Provider.AddColumn("Common_Language", "Enabled", DbType.Boolean);
+
+        var tableInfo = ((SQLiteTransformationProvider)Provider).GetSQLiteTableInfo("Common_Language");
+        var script = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript("Common_Language");
+
+        var columnProperty = tableInfo.Columns.Single(x => x.Name == "LanguageID").ColumnProperty;
+
+        // Assert        
+        Assert.That(script, Does.Contain("LanguageID TEXT NOT NULL PRIMARY KEY"));
     }
 
     [Test]
@@ -91,7 +107,8 @@ public void AddColumn_HavingNotNullInPrimaryKey_Succeds()
         var columnProperty = tableInfo.Columns.Single(x => x.Name == "LanguageID").ColumnProperty;
         var hasNull = columnProperty.IsSet(ColumnProperty.Null);
 
-        // Assert        
+        // Assert  
+        Assert.That(script, Does.Contain("LanguageID INTEGER NOT NULL PRIMARY KEY"));
         Assert.That(hasNull, Is.False);
     }
 }

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

@@ -87,10 +87,9 @@ public void AddTable_SinglePrimaryKey_ContainsNull()
 
         // Assert
         var createScript = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript(tableName);
-        Assert.That(createScript, Is.EqualTo("CREATE TABLE MyTableName (Column1 INTEGER NOT NULL PRIMARY KEY, Column2 INTEGER NOT NULL)"));
 
-        var pragmaTableInfos = ((SQLiteTransformationProvider)Provider).GetPragmaTableInfoItems(tableName);
-        Assert.That(pragmaTableInfos.All(x => x.NotNull), Is.True);
+        // In SQLite an INTEGER PRIMARY KEY column is NOT NULL implicitly (see insert asserts above)
+        Assert.That(createScript, Is.EqualTo("CREATE TABLE MyTableName (Column1 INTEGER PRIMARY KEY, Column2 INTEGER NOT NULL)"));
 
         var sqliteInfo = ((SQLiteTransformationProvider)Provider).GetSQLiteTableInfo(tableName);
         Assert.That(sqliteInfo.Columns.First().Name, Is.EqualTo(columnName1));

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

@@ -63,8 +63,7 @@ public void GetColumns_Primary_ColumnPropertyOk()
 
         // Assert
         Assert.That(columns.Single().ColumnProperty, Is.EqualTo(ColumnProperty.NotNull |
-            ColumnProperty.Identity |
-            ColumnProperty.PrimaryKey));
+            ColumnProperty.PrimaryKeyWithIdentity));
     }
 
     [Test]
@@ -82,8 +81,8 @@ public void GetColumns_PrimaryKeyOnTwoColumns_BothColumnsHavePrimaryKeyAndAreNot
         var columns = Provider.GetColumns(tableName);
 
         // Assert
-        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.Null));
-        Assert.That(columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.Null));
+        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
+        Assert.That(columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
     }
 
     [Test]

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

@@ -25,6 +25,7 @@ public void AddPrimaryIdentity_Succeeds()
 
         var sql = ((SQLiteTransformationProvider)Provider).GetSqlCreateTableScript(testTableName);
 
-        Assert.That(sql, Does.Contain("Color1 INTEGER NOT NULL PRIMARY KEY"));
+        // NOT NULL implicitly set in SQLite
+        Assert.That(sql, Does.Contain("Color1 INTEGER PRIMARY KEY"));
     }
 }

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

@@ -23,7 +23,7 @@ protected override void AddNull(Column column, List<string> vals)
 
     protected override void AddNotNull(Column column, List<string> vals)
     {
-        if (column.IsIdentity)
+        if (column.ColumnProperty.HasFlag(ColumnProperty.NotNull))
         {
             AddValueIfSelected(column, ColumnProperty.NotNull, vals);
         }

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

@@ -1212,12 +1212,16 @@ public override Column[] GetColumns(string tableName)
 
             if (pragmaTableInfoItem.Pk > 0)
             {
-                column.ColumnProperty |= ColumnProperty.PrimaryKey;
-
-                if (column.ColumnProperty.IsSet(ColumnProperty.Null))
+                if (new[] { DbType.UInt16, DbType.UInt32, DbType.UInt64, DbType.Int16, DbType.Int32, DbType.Int64 }.Contains(column.Type))
                 {
+                    column.ColumnProperty |= ColumnProperty.PrimaryKey;
+                    column.ColumnProperty |= ColumnProperty.NotNull;
                     column.ColumnProperty = column.ColumnProperty.Clear(ColumnProperty.Null);
                 }
+                else
+                {
+                    column.ColumnProperty |= ColumnProperty.PrimaryKey;
+                }
             }
 
             var indexListItems = GetPragmaIndexListItems(tableName);