Fix: SQLite compound primary keys

src/Migrator.Tests/ColumnPropertyMapperTest.cs

@@ -1,10 +1,10 @@
 using System.Data;
-using Migrator.Framework;
-using Migrator.Providers;
-using Migrator.Providers.Oracle;
-using Migrator.Providers.PostgreSQL;
-using Migrator.Providers.SQLite;
-using Migrator.Providers.SqlServer;
+using DotNetProjects.Migrator.Framework;
+using DotNetProjects.Migrator.Providers;
+using DotNetProjects.Migrator.Providers.Impl.Oracle;
+using DotNetProjects.Migrator.Providers.Impl.PostgreSQL;
+using DotNetProjects.Migrator.Providers.Impl.SQLite;
+using DotNetProjects.Migrator.Providers.Impl.SqlServer;
 using NUnit.Framework;
 
 namespace Migrator.Tests;

src/Migrator.Tests/Data/TestMigrations.cs

@@ -1,4 +1,4 @@
-using Migrator.Framework;
+using DotNetProjects.Migrator.Framework;
 
 namespace Migrator.Tests.Data;
 

src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyExtensionTests.cs

@@ -1,4 +1,3 @@
-using Migrator.Framework;
 using NUnit.Framework;
 using DotNetProjects.Migrator.Framework;
 using System;

src/Migrator.Tests/JoiningTableTransformationProviderExtensionsTests.cs

@@ -1,29 +1,28 @@
-using System.Data;
-using DotNetProjects.Migrator.Framework;
-using Migrator.Framework;
-using NSubstitute;
-using NUnit.Framework;
-
-namespace Migrator.Tests;
-
-[TestFixture]
-public class JoiningTableTransformationProviderExtensionsTests
-{
-    #region Setup/Teardown
-
-    [SetUp]
-    public void SetUp()
-    {
-        _provider = Substitute.For<ITransformationProvider>();
-    }
-
-    #endregion
-
-    private ITransformationProvider _provider;
-
-    [Test]
-    public void AddManyToManyJoiningTable_AddsPrimaryKey()
-    {
+using System.Data;
+using DotNetProjects.Migrator.Framework;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace Migrator.Tests;
+
+[TestFixture]
+public class JoiningTableTransformationProviderExtensionsTests
+{
+    #region Setup/Teardown
+
+    [SetUp]
+    public void SetUp()
+    {
+        _provider = Substitute.For<ITransformationProvider>();
+    }
+
+    #endregion
+
+    private ITransformationProvider _provider;
+
+    [Test]
+    public void AddManyToManyJoiningTable_AddsPrimaryKey()
+    {
         _provider
             .When(x => x.AddPrimaryKey(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string[]>()))
             .Do(callInfo =>
@@ -35,13 +34,13 @@ public void AddManyToManyJoiningTable_AddsPrimaryKey()
                 Assert.That(capturedTable, Is.EqualTo("dbo.TestScenarioVersions"));
                 Assert.That(columns, Does.Contain("TestScenarioId"));
                 Assert.That(columns, Does.Contain("VersionId"));
-            });
-
+            });
+
         _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesLeftHandSideColumn_WithCorrectName()
+    }
+
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesLeftHandSideColumn_WithCorrectName()
     {
         _provider
            .When(x => x.AddTable(Arg.Any<string>(), Arg.Any<Column[]>()))
@@ -52,14 +51,14 @@ public void AddManyToManyJoiningTable_CreatesLeftHandSideColumn_WithCorrectName(
                Assert.That(lhsColumn.Name, Is.EqualTo("TestScenarioId"));
                Assert.That(lhsColumn.Type, Is.EqualTo(DbType.Guid));
                Assert.That(ColumnProperty.NotNull, Is.EqualTo(lhsColumn.ColumnProperty));
-           });
-
+           });
+
         _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectAttributes()
-    {
+    }
+
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectAttributes()
+    {
         _provider
            .When(x => x.AddForeignKey(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()))
            .Do(callInfo =>
@@ -71,28 +70,28 @@ public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectA
                Assert.That(callInfo[3] as string, Is.EqualTo("dbo.TestScenarios"));
                Assert.That(callInfo[4] as string, Is.EqualTo("Id"));
                Assert.That((ForeignKeyConstraintType)callInfo[5], Is.EqualTo(ForeignKeyConstraintType.NoAction));
-           });
-
-        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
+           });
+
+        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
     }
 
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectName()
-    {
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectName()
+    {
         _provider
            .When(x => x.AddForeignKey(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()))
            .Do(callInfo =>
            {
                var lhsColumn = ((IDbField[])callInfo[1])[0] as Column;
 
                Assert.That(callInfo[0] as string, Is.EqualTo("FK_Scenarios_ScenarioVersions"));
-           });
-
-        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesRightHandSideColumn_WithCorrectName()
+           });
+
+        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
+    }
+
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesRightHandSideColumn_WithCorrectName()
     {
         _provider
           .When(x => x.AddTable(Arg.Any<string>(), Arg.Any<Column[]>()))
@@ -103,14 +102,14 @@ public void AddManyToManyJoiningTable_CreatesRightHandSideColumn_WithCorrectName
               Assert.That(rhsColumn.Name, Is.EqualTo("VersionId"));
               Assert.That(DbType.Guid, Is.EqualTo(rhsColumn.Type));
               Assert.That(ColumnProperty.NotNull, Is.EqualTo(rhsColumn.ColumnProperty));
-          });
-
-        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectAttributes()
-    {
+          });
+
+        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
+    }
+
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectAttributes()
+    {
         _provider
           .When(x => x.AddTable(Arg.Any<string>(), Arg.Any<Column[]>()))
           .Do(callInfo =>
@@ -126,13 +125,13 @@ public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrect
               Assert.That(callInfo[3] as string, Is.EqualTo("dbo.Versions"));
               Assert.That(callInfo[4] as string, Is.EqualTo("Id"));
               Assert.That((ForeignKeyConstraintType)callInfo[5], Is.EqualTo(ForeignKeyConstraintType.NoAction));
-          });
-
-        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectName()
+          });
+
+        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
+    }
+
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrectName()
     {
         _provider
          .When(x => x.AddForeignKey(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>()))
@@ -141,28 +140,28 @@ public void AddManyToManyJoiningTable_CreatesRightHandSideForeignKey_WithCorrect
              var lhsColumn = ((IDbField[])callInfo[1])[0] as Column;
 
              Assert.That(callInfo[0] as string, Is.EqualTo("FK_Scenarios_ScenarioVersions"));
-         });
-
-        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void AddManyToManyJoiningTable_CreatesTableWithCorrectName()
-    {
+         });
+
+        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
+    }
+
+    [Test]
+    public void AddManyToManyJoiningTable_CreatesTableWithCorrectName()
+    {
         _provider
           .When(x => x.AddTable(Arg.Any<string>(), Arg.Any<Column[]>()))
           .Do(callInfo =>
           {
               var rhsColumn = ((IDbField[])callInfo[1])[0] as Column;
 
-              Assert.That(callInfo[1] as string, Is.EqualTo("dbo.TestScenarioVersions"));
-          });
-
-        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
-    }
-
-    [Test]
-    public void RemoveManyToManyJoiningTable_RemovesLhsForeignKey()
+              Assert.That(callInfo[1] as string, Is.EqualTo("dbo.TestScenarioVersions"));
+          });
+
+        _provider.AddManyToManyJoiningTable("dbo", "TestScenarios", "Id", "Versions", "Id");
+    }
+
+    [Test]
+    public void RemoveManyToManyJoiningTable_RemovesLhsForeignKey()
     {
         var callCount = 0;
 
@@ -176,16 +175,16 @@ public void RemoveManyToManyJoiningTable_RemovesLhsForeignKey()
                 Assert.That(callInfo[0] as string, Is.EqualTo("dbo.TestScenarioVersions"));
                 Assert.That(callInfo[1] as string, Is.EqualTo("FK_Scenarios_ScenarioVersions"));
             }
-        });
-
-        _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
-    }
-
-    [Test]
-    public void RemoveManyToManyJoiningTable_RemovesRhsForeignKey()
-    {
-        var callCount = 0;
-
+        });
+
+        _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
+    }
+
+    [Test]
+    public void RemoveManyToManyJoiningTable_RemovesRhsForeignKey()
+    {
+        var callCount = 0;
+
         _provider
         .When(x => x.RemoveForeignKey(Arg.Any<string>(), Arg.Any<string>()))
         .Do(callInfo =>
@@ -196,21 +195,21 @@ public void RemoveManyToManyJoiningTable_RemovesRhsForeignKey()
                 Assert.That(callInfo[0] as string, Is.EqualTo("dbo.TestScenarioVersions"));
                 Assert.That(callInfo[1] as string, Is.EqualTo("FK_Versions_ScenarioVersions"));
             }
-        });
-
-        _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
-    }
-
-    [Test]
-    public void RemoveManyToManyJoiningTable_RemovesTable()
-    {
+        });
+
+        _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
+    }
+
+    [Test]
+    public void RemoveManyToManyJoiningTable_RemovesTable()
+    {
         _provider
         .When(x => x.RemoveTable(Arg.Any<string>()))
         .Do(callInfo =>
         {
             Assert.That(callInfo[0] as string, Is.EqualTo("dbo.TestScenarioVersions"));
-        });
-
-        _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
-    }
-}
+        });
+
+        _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions");
+    }
+}

src/Migrator.Tests/MigrationLoaderTest.cs

@@ -1,7 +1,7 @@
 using System.Reflection;
 using DotNetProjects.Migrator;
-using Migrator.Framework;
-using Migrator.Framework.Loggers;
+using DotNetProjects.Migrator.Framework;
+using DotNetProjects.Migrator.Framework.Loggers;
 using NSubstitute;
 using NUnit.Framework;
 

src/Migrator.Tests/MigrationTestCase.cs

@@ -12,7 +12,7 @@
 #endregion
 
 using System.Reflection;
-using Migrator.Providers;
+using DotNetProjects.Migrator.Providers;
 using NUnit.Framework;
 
 namespace Migrator.Tests;
@@ -22,7 +22,7 @@ namespace Migrator.Tests;
 /// </summary>
 public abstract class MigrationsTestCase
 {
-    private Migrator _migrator;
+    private DotNetProjects.Migrator.Migrator _migrator;
 
     protected abstract TransformationProvider TransformationProvider { get; }
     protected abstract string ConnectionString { get; }
@@ -31,7 +31,7 @@ public abstract class MigrationsTestCase
     [SetUp]
     public void SetUp()
     {
-        _migrator = new Migrator(TransformationProvider, MigrationAssembly, true);
+        _migrator = new DotNetProjects.Migrator.Migrator(TransformationProvider, MigrationAssembly, true);
 
         Assert.That(_migrator.MigrationsTypes.Count > 0, Is.True, "No migrations in assembly " + MigrationAssembly.Location);
 

src/Migrator.Tests/MigrationTypeComparerTest.cs

@@ -13,7 +13,8 @@
 
 using System;
 using System.Collections.Generic;
-using Migrator.Framework;
+using DotNetProjects.Migrator;
+using DotNetProjects.Migrator.Framework;
 using NUnit.Framework;
 
 namespace Migrator.Tests;