diff --git a/src/Migrator.Tests/ColumnPropertyMapperTest.cs b/src/Migrator.Tests/ColumnPropertyMapperTest.cs index 5c779348..3add18d0 100644 --- a/src/Migrator.Tests/ColumnPropertyMapperTest.cs +++ b/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; diff --git a/src/Migrator.Tests/Data/TestMigrations.cs b/src/Migrator.Tests/Data/TestMigrations.cs index 262e0298..1413c9c9 100644 --- a/src/Migrator.Tests/Data/TestMigrations.cs +++ b/src/Migrator.Tests/Data/TestMigrations.cs @@ -1,4 +1,4 @@ -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; namespace Migrator.Tests.Data; diff --git a/src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyExtensionTests.cs b/src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyExtensionTests.cs index 4eb572cb..62853440 100644 --- a/src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyExtensionTests.cs +++ b/src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyExtensionTests.cs @@ -1,4 +1,3 @@ -using Migrator.Framework; using NUnit.Framework; using DotNetProjects.Migrator.Framework; using System; diff --git a/src/Migrator.Tests/JoiningTableTransformationProviderExtensionsTests.cs b/src/Migrator.Tests/JoiningTableTransformationProviderExtensionsTests.cs index 5af95e8a..938912a1 100644 --- a/src/Migrator.Tests/JoiningTableTransformationProviderExtensionsTests.cs +++ b/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(); - } - - #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(); + } + + #endregion + + private ITransformationProvider _provider; + + [Test] + public void AddManyToManyJoiningTable_AddsPrimaryKey() + { _provider .When(x => x.AddPrimaryKey(Arg.Any(), Arg.Any(), Arg.Any())) .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(), Arg.Any())) @@ -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(), Arg.Any(), Arg.Any(), Arg.Any(), Arg.Any())) .Do(callInfo => @@ -71,14 +70,14 @@ 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(), Arg.Any(), Arg.Any(), Arg.Any(), Arg.Any())) .Do(callInfo => @@ -86,13 +85,13 @@ public void AddManyToManyJoiningTable_CreatesLeftHandSideForeignKey_WithCorrectN 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(), Arg.Any())) @@ -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(), Arg.Any())) .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(), Arg.Any(), Arg.Any(), Arg.Any(), Arg.Any())) @@ -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(), Arg.Any())) .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(), Arg.Any())) .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())) .Do(callInfo => { Assert.That(callInfo[0] as string, Is.EqualTo("dbo.TestScenarioVersions")); - }); - - _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions"); - } -} + }); + + _provider.RemoveManyToManyJoiningTable("dbo", "TestScenarios", "Versions"); + } +} diff --git a/src/Migrator.Tests/MigrationLoaderTest.cs b/src/Migrator.Tests/MigrationLoaderTest.cs index 4002df99..fec13989 100644 --- a/src/Migrator.Tests/MigrationLoaderTest.cs +++ b/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; diff --git a/src/Migrator.Tests/MigrationTestCase.cs b/src/Migrator.Tests/MigrationTestCase.cs index 118b6ec2..106d7cc6 100644 --- a/src/Migrator.Tests/MigrationTestCase.cs +++ b/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; /// 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); diff --git a/src/Migrator.Tests/MigrationTypeComparerTest.cs b/src/Migrator.Tests/MigrationTypeComparerTest.cs index 4e53bd77..ae57d1d7 100644 --- a/src/Migrator.Tests/MigrationTypeComparerTest.cs +++ b/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; diff --git a/src/Migrator.Tests/MigratorTest.cs b/src/Migrator.Tests/MigratorTest.cs index 2f76f2e9..881cd519 100644 --- a/src/Migrator.Tests/MigratorTest.cs +++ b/src/Migrator.Tests/MigratorTest.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Reflection; -using Migrator.Framework; -using Migrator.Framework.Loggers; +using DotNetProjects.Migrator; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Framework.Loggers; using NSubstitute; using NUnit.Framework; @@ -21,7 +22,7 @@ public void SetUp() #endregion - private Migrator _migrator; + private DotNetProjects.Migrator.Migrator _migrator; // Collections that contain the version that are called migrating up and down private static readonly List _upCalled = new List(); @@ -51,19 +52,19 @@ private void SetUpCurrentVersion(long version, bool assertRollbackIsCalled, bool providerMock.AppliedMigrations.Returns(appliedVersions); providerMock.Logger.Returns(new Logger(false)); - providerMock.When(x => x.Dispose()).Do(_ => - { - if (assertRollbackIsCalled) - { - providerMock.Received().Rollback(); - } - else - { - providerMock.DidNotReceive().Rollback(); - } + providerMock.When(x => x.Dispose()).Do(_ => + { + if (assertRollbackIsCalled) + { + providerMock.Received().Rollback(); + } + else + { + providerMock.DidNotReceive().Rollback(); + } }); - _migrator = new Migrator((ITransformationProvider)providerMock, Assembly.GetExecutingAssembly(), false); + _migrator = new DotNetProjects.Migrator.Migrator((ITransformationProvider)providerMock, Assembly.GetExecutingAssembly(), false); _migrator.MigrationsTypes.Clear(); _upCalled.Clear(); diff --git a/src/Migrator.Tests/MigratorTestDates.cs b/src/Migrator.Tests/MigratorTestDates.cs index e93c45a5..0065ef3f 100644 --- a/src/Migrator.Tests/MigratorTestDates.cs +++ b/src/Migrator.Tests/MigratorTestDates.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Reflection; -using Migrator.Framework; -using Migrator.Framework.Loggers; +using DotNetProjects.Migrator; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Framework.Loggers; using NSubstitute; using NUnit.Framework; @@ -17,7 +18,7 @@ public void SetUp() SetUpCurrentVersion(0); } - private Migrator _migrator; + private DotNetProjects.Migrator.Migrator _migrator; // Collections that contain the version that are called migrating up and down private static readonly List _upCalled = []; @@ -47,8 +48,8 @@ private void SetUpCurrentVersion(long version, bool assertRollbackIsCalled, bool private void SetUpCurrentVersion(long version, List appliedVersions, bool assertRollbackIsCalled, bool includeBad) { - var providerMock = Substitute.For(); - + var providerMock = Substitute.For(); + providerMock.AppliedMigrations.Returns(appliedVersions); providerMock.Logger.Returns(new Logger(false)); @@ -64,7 +65,7 @@ private void SetUpCurrentVersion(long version, List appliedVersions, bool } }); - _migrator = new Migrator((ITransformationProvider)providerMock, Assembly.GetExecutingAssembly(), false); + _migrator = new DotNetProjects.Migrator.Migrator((ITransformationProvider)providerMock, Assembly.GetExecutingAssembly(), false); _migrator.MigrationsTypes.Clear(); _upCalled.Clear(); diff --git a/src/Migrator.Tests/ProviderFactoryTest.cs b/src/Migrator.Tests/ProviderFactoryTest.cs index 6a8061d2..dce3dcef 100644 --- a/src/Migrator.Tests/ProviderFactoryTest.cs +++ b/src/Migrator.Tests/ProviderFactoryTest.cs @@ -2,7 +2,8 @@ using System.Configuration; using System.Diagnostics; using System.Linq; -using Migrator.Providers; +using DotNetProjects.Migrator; +using DotNetProjects.Migrator.Providers; using Migrator.Tests.Settings; using Migrator.Tests.Settings.Config; using Npgsql; diff --git a/src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs b/src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs index 06ce6fcf..6ad3c5c1 100644 --- a/src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs +++ b/src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs @@ -1,6 +1,6 @@ using System; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; using Migrator.Tests.Providers.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/Base/TransformationProviderConstraintBase.cs b/src/Migrator.Tests/Providers/Base/TransformationProviderConstraintBase.cs index 9da124c7..8a096bcd 100644 --- a/src/Migrator.Tests/Providers/Base/TransformationProviderConstraintBase.cs +++ b/src/Migrator.Tests/Providers/Base/TransformationProviderConstraintBase.cs @@ -1,7 +1,7 @@ using System; using System.Data; using System.Linq; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; using NUnit.Framework; namespace Migrator.Tests.Providers; diff --git a/src/Migrator.Tests/Providers/Base/TransformationProviderSimpleBase.cs b/src/Migrator.Tests/Providers/Base/TransformationProviderSimpleBase.cs index c77832f3..7a599de4 100644 --- a/src/Migrator.Tests/Providers/Base/TransformationProviderSimpleBase.cs +++ b/src/Migrator.Tests/Providers/Base/TransformationProviderSimpleBase.cs @@ -1,6 +1,6 @@ using System; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; using NUnit.Framework; namespace Migrator.Tests.Providers.Base; diff --git a/src/Migrator.Tests/Providers/GenericProviderTests.cs b/src/Migrator.Tests/Providers/GenericProviderTests.cs index 7389a55f..9cdce313 100644 --- a/src/Migrator.Tests/Providers/GenericProviderTests.cs +++ b/src/Migrator.Tests/Providers/GenericProviderTests.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; - -using Migrator.Providers; +using DotNetProjects.Migrator.Providers; using NUnit.Framework; namespace Migrator.Tests.Providers; diff --git a/src/Migrator.Tests/Providers/OracleProvider/OracleTransformationProviderTest.cs b/src/Migrator.Tests/Providers/OracleProvider/OracleTransformationProviderTest.cs index f3a2513f..1a582756 100644 --- a/src/Migrator.Tests/Providers/OracleProvider/OracleTransformationProviderTest.cs +++ b/src/Migrator.Tests/Providers/OracleProvider/OracleTransformationProviderTest.cs @@ -2,11 +2,10 @@ using System.Data; using System.Threading; using System.Threading.Tasks; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Providers; using DotNetProjects.Migrator.Providers.Impl.Oracle; using DryIoc; -using Migrator.Framework; -using Migrator.Providers; -using Migrator.Providers.Oracle; using Migrator.Tests.Database; using Migrator.Tests.Database.Interfaces; using Migrator.Tests.Settings; diff --git a/src/Migrator.Tests/Providers/PostgreSQL/Base/PostgreSQLTransformationProviderTestBase.cs b/src/Migrator.Tests/Providers/PostgreSQL/Base/PostgreSQLTransformationProviderTestBase.cs index 42f1e8a8..d8ce1eb7 100644 --- a/src/Migrator.Tests/Providers/PostgreSQL/Base/PostgreSQLTransformationProviderTestBase.cs +++ b/src/Migrator.Tests/Providers/PostgreSQL/Base/PostgreSQLTransformationProviderTestBase.cs @@ -1,5 +1,5 @@ -using Migrator.Providers; -using Migrator.Providers.PostgreSQL; +using DotNetProjects.Migrator.Providers; +using DotNetProjects.Migrator.Providers.Impl.PostgreSQL; using Migrator.Tests.Providers.Base; using Migrator.Tests.Settings; using Migrator.Tests.Settings.Config; @@ -16,8 +16,8 @@ public void SetUp() { var configReader = new ConfigurationReader(); var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.PostgreSQL) - ?.ConnectionString; - + ?.ConnectionString; + if (string.IsNullOrEmpty(connectionString)) { throw new IgnoreException("No Postgre ConnectionString is Set."); diff --git a/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProviderTest.cs b/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProviderTest.cs index f33f0890..a1e973ec 100644 --- a/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProviderTest.cs +++ b/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProviderTest.cs @@ -1,5 +1,5 @@ -using Migrator.Providers; -using Migrator.Providers.PostgreSQL; +using DotNetProjects.Migrator.Providers; +using DotNetProjects.Migrator.Providers.Impl.PostgreSQL; using Migrator.Tests.Settings; using Migrator.Tests.Settings.Config; using NUnit.Framework; @@ -17,9 +17,9 @@ public void SetUp() var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.PostgreSQL) ?.ConnectionString; - if (string.IsNullOrEmpty(connectionString)) - { - throw new IgnoreException("No Postgre ConnectionString is Set."); + if (string.IsNullOrEmpty(connectionString)) + { + throw new IgnoreException("No Postgre ConnectionString is Set."); } DbProviderFactories.RegisterFactory("Npgsql", () => Npgsql.NpgsqlFactory.Instance); diff --git a/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_PrimaryKeyWithIdentityTests.cs b/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_PrimaryKeyWithIdentityTests.cs index 7c9442e1..1070bd93 100644 --- a/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_PrimaryKeyWithIdentityTests.cs +++ b/src/Migrator.Tests/Providers/PostgreSQL/PostgreSQLTransformationProvider_PrimaryKeyWithIdentityTests.cs @@ -1,6 +1,6 @@ using System; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; using Npgsql; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs b/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs index 65f19e70..7f9cbe32 100644 --- a/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs +++ b/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs @@ -1,8 +1,8 @@ using System.Threading; using System.Threading.Tasks; +using DotNetProjects.Migrator.Providers; +using DotNetProjects.Migrator.Providers.Impl.SqlServer; using DryIoc; -using Migrator.Providers; -using Migrator.Providers.SqlServer; using Migrator.Tests.Database; using Migrator.Tests.Database.Interfaces; using Migrator.Tests.Providers.Base; diff --git a/src/Migrator.Tests/Providers/SQLServer/SQLServerTransformationProvider_NVARCHARnTests.cs b/src/Migrator.Tests/Providers/SQLServer/SQLServerTransformationProvider_NVARCHARnTests.cs index fcc639a4..0cce1e4f 100644 --- a/src/Migrator.Tests/Providers/SQLServer/SQLServerTransformationProvider_NVARCHARnTests.cs +++ b/src/Migrator.Tests/Providers/SQLServer/SQLServerTransformationProvider_NVARCHARnTests.cs @@ -1,6 +1,6 @@ using System.Data; +using DotNetProjects.Migrator.Framework; using Microsoft.Data.SqlClient; -using Migrator.Framework; using Migrator.Tests.Providers.SQLServer.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderGenericTests.cs b/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderGenericTests.cs index 02a22015..e574d275 100644 --- a/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderGenericTests.cs +++ b/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderGenericTests.cs @@ -2,9 +2,9 @@ using System.Data; using System.Threading; using System.Threading.Tasks; +using DotNetProjects.Migrator.Providers; +using DotNetProjects.Migrator.Providers.Impl.SqlServer; using DryIoc; -using Migrator.Providers; -using Migrator.Providers.SqlServer; using Migrator.Tests.Database; using Migrator.Tests.Database.Interfaces; using Migrator.Tests.Settings; diff --git a/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTests.cs b/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTests.cs index f415f87e..99c76797 100644 --- a/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTests.cs +++ b/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTests.cs @@ -1,7 +1,7 @@ using System.Data; using System.Threading.Tasks; -using Migrator.Providers; -using Migrator.Providers.SqlServer; +using DotNetProjects.Migrator.Providers; +using DotNetProjects.Migrator.Providers.Impl.SqlServer; using Migrator.Tests.Providers.SQLServer.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs b/src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs index 62de83cd..69cd6a1a 100644 --- a/src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs +++ b/src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs @@ -1,5 +1,4 @@ using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Providers.SQLite; using Migrator.Tests.Providers.Base; using Migrator.Tests.Settings; using Migrator.Tests.Settings.Config; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs index b5d9b7e1..af56f8cd 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs @@ -1,5 +1,4 @@ using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Providers.SQLite; using Migrator.Tests.Settings; using Migrator.Tests.Settings.Config; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderTests.cs index ef0ee54a..3d26a7c4 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderTests.cs @@ -1,7 +1,7 @@ using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; using NUnit.Framework.Legacy; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddColumnTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddColumnTests.cs index 54ce6e4c..6eb4d004 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddColumnTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddColumnTests.cs @@ -1,7 +1,7 @@ using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; using NUnit.Framework.Legacy; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddTableTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddTableTests.cs index b4d9ea8e..291d30c0 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddTableTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_AddTableTests.cs @@ -2,7 +2,6 @@ using System.Linq; using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; @@ -47,10 +46,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)); diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_ChangeColumnTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_ChangeColumnTests.cs index 966a4e56..e73aedfc 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_ChangeColumnTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_ChangeColumnTests.cs @@ -1,7 +1,7 @@ using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; using NUnit.Framework.Legacy; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs index c2399b0b..da14ce25 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs @@ -1,6 +1,6 @@ using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; @@ -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] diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetForeignKeysTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetForeignKeysTests.cs index 9ca00ee5..17b431b1 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetForeignKeysTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetForeignKeysTests.cs @@ -1,6 +1,6 @@ using System.Data; using System.Linq; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetUniques.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetUniques.cs index 57962ea1..34093be0 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetUniques.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetUniques.cs @@ -1,7 +1,7 @@ using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_PropertyColumnIdentityTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_PropertyColumnIdentityTests.cs index ef73d215..1034e155 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_PropertyColumnIdentityTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_PropertyColumnIdentityTests.cs @@ -1,6 +1,6 @@ using System.Data; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RecreateTable.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RecreateTable.cs new file mode 100644 index 00000000..b2c47c8b --- /dev/null +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RecreateTable.cs @@ -0,0 +1,36 @@ +using System; +using System.Data; +using System.Linq; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Providers.Impl.SQLite; +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))")); + } +} \ No newline at end of file diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveAllConstraintsTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveAllConstraintsTests.cs index 03421d2c..6494b426 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveAllConstraintsTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveAllConstraintsTests.cs @@ -1,8 +1,8 @@ using System; using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; using NUnit.Framework.Legacy; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveColumnTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveColumnTests.cs index 96626d8f..9c089e1c 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveColumnTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RemoveColumnTests.cs @@ -1,8 +1,8 @@ using System; using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; using NUnit.Framework.Legacy; diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RenameColumnTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RenameColumnTests.cs index 731c2403..8821031d 100644 --- a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RenameColumnTests.cs +++ b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_RenameColumnTests.cs @@ -1,7 +1,8 @@ +using System; using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; using Migrator.Tests.Providers.SQLite.Base; using NUnit.Framework; diff --git a/src/Migrator.Tests/SchemaBuilderTests.cs b/src/Migrator.Tests/SchemaBuilderTests.cs index 28a55769..f0adc61c 100644 --- a/src/Migrator.Tests/SchemaBuilderTests.cs +++ b/src/Migrator.Tests/SchemaBuilderTests.cs @@ -1,7 +1,6 @@ using System.Data; using DotNetProjects.Migrator.Framework; -using Migrator.Framework; -using Migrator.Framework.SchemaBuilder; +using DotNetProjects.Migrator.Framework.SchemaBuilder; using NUnit.Framework; namespace Migrator.Tests; diff --git a/src/Migrator.Tests/Tools/SqlFileLoggerTest.cs b/src/Migrator.Tests/Tools/SqlFileLoggerTest.cs index 85872a55..01424cd6 100644 --- a/src/Migrator.Tests/Tools/SqlFileLoggerTest.cs +++ b/src/Migrator.Tests/Tools/SqlFileLoggerTest.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -using Migrator.Framework.Loggers; +using DotNetProjects.Migrator.Framework.Loggers; using NUnit.Framework; namespace Migrator.Tests.Tools; diff --git a/src/Migrator/BaseMigrate.cs b/src/Migrator/BaseMigrate.cs index 482d8368..a8d9ea69 100644 --- a/src/Migrator/BaseMigrate.cs +++ b/src/Migrator/BaseMigrate.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator; +namespace DotNetProjects.Migrator; public abstract class BaseMigrate { diff --git a/src/Migrator/Framework/Column.cs b/src/Migrator/Framework/Column.cs index 11bc6f47..6d497bc3 100644 --- a/src/Migrator/Framework/Column.cs +++ b/src/Migrator/Framework/Column.cs @@ -13,7 +13,7 @@ using System.Data; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// Represents a table column. diff --git a/src/Migrator/Framework/ColumnProperty.cs b/src/Migrator/Framework/ColumnProperty.cs index d2cf6118..a49ddd1b 100644 --- a/src/Migrator/Framework/ColumnProperty.cs +++ b/src/Migrator/Framework/ColumnProperty.cs @@ -1,6 +1,6 @@ using System; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// Represents a table column properties. diff --git a/src/Migrator/Framework/ColumnPropertyExtensions.cs b/src/Migrator/Framework/ColumnPropertyExtensions.cs index c682c881..989b11fb 100644 --- a/src/Migrator/Framework/ColumnPropertyExtensions.cs +++ b/src/Migrator/Framework/ColumnPropertyExtensions.cs @@ -1,5 +1,3 @@ -using Migrator.Framework; - namespace DotNetProjects.Migrator.Framework; public static class ColumnPropertyExtensions diff --git a/src/Migrator/Framework/DataRecordExtensions.cs b/src/Migrator/Framework/DataRecordExtensions.cs index a6117549..be83a34e 100644 --- a/src/Migrator/Framework/DataRecordExtensions.cs +++ b/src/Migrator/Framework/DataRecordExtensions.cs @@ -1,7 +1,7 @@ using System; using System.Data; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public static class DataRecordExtensions { diff --git a/src/Migrator/Framework/ForeignKeyConstraint.cs b/src/Migrator/Framework/ForeignKeyConstraint.cs index 828ce169..d12e8b2b 100644 --- a/src/Migrator/Framework/ForeignKeyConstraint.cs +++ b/src/Migrator/Framework/ForeignKeyConstraint.cs @@ -1,6 +1,4 @@ -using Migrator.Framework; - -namespace DotNetProjects.Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public class ForeignKeyConstraint : IDbField { diff --git a/src/Migrator/Framework/IColumn.cs b/src/Migrator/Framework/IColumn.cs index 615d693b..14b49729 100644 --- a/src/Migrator/Framework/IColumn.cs +++ b/src/Migrator/Framework/IColumn.cs @@ -13,7 +13,7 @@ using System.Data; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface IColumn { diff --git a/src/Migrator/Framework/IDbField.cs b/src/Migrator/Framework/IDbField.cs index 289464e9..79cdaa03 100644 --- a/src/Migrator/Framework/IDbField.cs +++ b/src/Migrator/Framework/IDbField.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface IDbField { diff --git a/src/Migrator/Framework/IDialect.cs b/src/Migrator/Framework/IDialect.cs index 1b918885..13d25bb9 100644 --- a/src/Migrator/Framework/IDialect.cs +++ b/src/Migrator/Framework/IDialect.cs @@ -1,9 +1,6 @@ -using System; -using System.Collections.Generic; using System.Data; -using System.Data.Common; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface IDialect { diff --git a/src/Migrator/Framework/ILogger.cs b/src/Migrator/Framework/ILogger.cs index f96b34e2..3d36e265 100644 --- a/src/Migrator/Framework/ILogger.cs +++ b/src/Migrator/Framework/ILogger.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface ILogger { diff --git a/src/Migrator/Framework/IMigration.cs b/src/Migrator/Framework/IMigration.cs index fb2b7484..f8a53e50 100644 --- a/src/Migrator/Framework/IMigration.cs +++ b/src/Migrator/Framework/IMigration.cs @@ -1,4 +1,4 @@ -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface IMigration { diff --git a/src/Migrator/Framework/ITransformationProvider.cs b/src/Migrator/Framework/ITransformationProvider.cs index 08fe2eb3..7d01117a 100644 --- a/src/Migrator/Framework/ITransformationProvider.cs +++ b/src/Migrator/Framework/ITransformationProvider.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; using System.Data; -using DotNetProjects.Migrator.Framework; -using ForeignKeyConstraint = DotNetProjects.Migrator.Framework.ForeignKeyConstraint; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// The main interface to use in Migrations to make changes on a database schema. diff --git a/src/Migrator/Framework/IViewElement.cs b/src/Migrator/Framework/IViewElement.cs index a177dc76..ad010949 100644 --- a/src/Migrator/Framework/IViewElement.cs +++ b/src/Migrator/Framework/IViewElement.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface IViewElement { diff --git a/src/Migrator/Framework/IViewField.cs b/src/Migrator/Framework/IViewField.cs index 1514c225..5fa20741 100644 --- a/src/Migrator/Framework/IViewField.cs +++ b/src/Migrator/Framework/IViewField.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public interface IViewField { diff --git a/src/Migrator/Framework/Index.cs b/src/Migrator/Framework/Index.cs index 04167838..92c2e1a4 100644 --- a/src/Migrator/Framework/Index.cs +++ b/src/Migrator/Framework/Index.cs @@ -1,4 +1,4 @@ -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public class Index : IDbField { diff --git a/src/Migrator/Framework/JoinType.cs b/src/Migrator/Framework/JoinType.cs index 0c070453..64f0adf6 100644 --- a/src/Migrator/Framework/JoinType.cs +++ b/src/Migrator/Framework/JoinType.cs @@ -1,4 +1,4 @@ -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public enum JoinType { diff --git a/src/Migrator/Framework/JoiningTableTransformationProviderExtensions.cs b/src/Migrator/Framework/JoiningTableTransformationProviderExtensions.cs index 5b1df49a..d66a3128 100644 --- a/src/Migrator/Framework/JoiningTableTransformationProviderExtensions.cs +++ b/src/Migrator/Framework/JoiningTableTransformationProviderExtensions.cs @@ -1,11 +1,7 @@ -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using DotNetProjects.Migrator.Framework; -using Migrator.Framework.Support; - -namespace Migrator.Framework; +using System.Data; +using DotNetProjects.Migrator.Framework.Support; + +namespace DotNetProjects.Migrator.Framework; /// /// A set of extension methods for the transformation provider to make it easier to diff --git a/src/Migrator/Framework/Loggers/ConsoleWriter.cs b/src/Migrator/Framework/Loggers/ConsoleWriter.cs index 9fe4b88c..84d8ca70 100644 --- a/src/Migrator/Framework/Loggers/ConsoleWriter.cs +++ b/src/Migrator/Framework/Loggers/ConsoleWriter.cs @@ -13,7 +13,7 @@ using System; -namespace Migrator.Framework.Loggers; +namespace DotNetProjects.Migrator.Framework.Loggers; public class ConsoleWriter : ILogWriter { diff --git a/src/Migrator/Framework/Loggers/IAttachableLogger.cs b/src/Migrator/Framework/Loggers/IAttachableLogger.cs index 0419cabd..f6f480d4 100644 --- a/src/Migrator/Framework/Loggers/IAttachableLogger.cs +++ b/src/Migrator/Framework/Loggers/IAttachableLogger.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.Loggers; +namespace DotNetProjects.Migrator.Framework.Loggers; /// /// ILogger interface. diff --git a/src/Migrator/Framework/Loggers/ILogWriter.cs b/src/Migrator/Framework/Loggers/ILogWriter.cs index d4144e81..ee84f9bc 100644 --- a/src/Migrator/Framework/Loggers/ILogWriter.cs +++ b/src/Migrator/Framework/Loggers/ILogWriter.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.Loggers; +namespace DotNetProjects.Migrator.Framework.Loggers; /// /// Handles writing a message to the log medium (i.e. file, console) diff --git a/src/Migrator/Framework/Loggers/Logger.cs b/src/Migrator/Framework/Loggers/Logger.cs index eeb4791e..0389fc34 100644 --- a/src/Migrator/Framework/Loggers/Logger.cs +++ b/src/Migrator/Framework/Loggers/Logger.cs @@ -14,7 +14,7 @@ using System; using System.Collections.Generic; -namespace Migrator.Framework.Loggers; +namespace DotNetProjects.Migrator.Framework.Loggers; /// /// Text logger for the migration mediator diff --git a/src/Migrator/Framework/Loggers/SqlScriptFileLogger.cs b/src/Migrator/Framework/Loggers/SqlScriptFileLogger.cs index de4ffa15..0d81c179 100644 --- a/src/Migrator/Framework/Loggers/SqlScriptFileLogger.cs +++ b/src/Migrator/Framework/Loggers/SqlScriptFileLogger.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; -namespace Migrator.Framework.Loggers; +namespace DotNetProjects.Migrator.Framework.Loggers; public class SqlScriptFileLogger : ILogger, IDisposable { diff --git a/src/Migrator/Framework/Maximums.cs b/src/Migrator/Framework/Maximums.cs index e1bb9ecd..5727b84b 100644 --- a/src/Migrator/Framework/Maximums.cs +++ b/src/Migrator/Framework/Maximums.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public static class Maximums { diff --git a/src/Migrator/Framework/Migration.cs b/src/Migrator/Framework/Migration.cs index 0bf49158..c0909789 100644 --- a/src/Migrator/Framework/Migration.cs +++ b/src/Migrator/Framework/Migration.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// A migration is a group of transformation applied to the database schema diff --git a/src/Migrator/Framework/MigrationAttribute.cs b/src/Migrator/Framework/MigrationAttribute.cs index 6e2fc76a..483e2f3d 100644 --- a/src/Migrator/Framework/MigrationAttribute.cs +++ b/src/Migrator/Framework/MigrationAttribute.cs @@ -13,7 +13,7 @@ using System; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// Describe a migration diff --git a/src/Migrator/Framework/MigrationException.cs b/src/Migrator/Framework/MigrationException.cs index 98aecbd1..176a099a 100644 --- a/src/Migrator/Framework/MigrationException.cs +++ b/src/Migrator/Framework/MigrationException.cs @@ -13,7 +13,7 @@ using System; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// Base class for migration errors. diff --git a/src/Migrator/Framework/MigratorDbType.cs b/src/Migrator/Framework/MigratorDbType.cs index 5fc88c82..6e5e09f2 100644 --- a/src/Migrator/Framework/MigratorDbType.cs +++ b/src/Migrator/Framework/MigratorDbType.cs @@ -1,4 +1,4 @@ -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public enum MigratorDbType { diff --git a/src/Migrator/Framework/SchemaBuilder/AddColumnExpression.cs b/src/Migrator/Framework/SchemaBuilder/AddColumnExpression.cs index 26e40d90..3a070dd9 100644 --- a/src/Migrator/Framework/SchemaBuilder/AddColumnExpression.cs +++ b/src/Migrator/Framework/SchemaBuilder/AddColumnExpression.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class AddColumnExpression : ISchemaBuilderExpression { diff --git a/src/Migrator/Framework/SchemaBuilder/AddTableExpression.cs b/src/Migrator/Framework/SchemaBuilder/AddTableExpression.cs index dee4e0e9..c86ec384 100644 --- a/src/Migrator/Framework/SchemaBuilder/AddTableExpression.cs +++ b/src/Migrator/Framework/SchemaBuilder/AddTableExpression.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class AddTableExpression : ISchemaBuilderExpression { diff --git a/src/Migrator/Framework/SchemaBuilder/DeleteTableExpression.cs b/src/Migrator/Framework/SchemaBuilder/DeleteTableExpression.cs index 62f57ee1..f6e928f0 100644 --- a/src/Migrator/Framework/SchemaBuilder/DeleteTableExpression.cs +++ b/src/Migrator/Framework/SchemaBuilder/DeleteTableExpression.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class DeleteTableExpression : ISchemaBuilderExpression { diff --git a/src/Migrator/Framework/SchemaBuilder/FluentColumn.cs b/src/Migrator/Framework/SchemaBuilder/FluentColumn.cs index 3b8a8907..f6a39776 100644 --- a/src/Migrator/Framework/SchemaBuilder/FluentColumn.cs +++ b/src/Migrator/Framework/SchemaBuilder/FluentColumn.cs @@ -12,9 +12,8 @@ #endregion using System.Data; -using DotNetProjects.Migrator.Framework; -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class FluentColumn : IFluentColumn { diff --git a/src/Migrator/Framework/SchemaBuilder/ForeignKey.cs b/src/Migrator/Framework/SchemaBuilder/ForeignKey.cs index 9b2dafe9..e3318f82 100644 --- a/src/Migrator/Framework/SchemaBuilder/ForeignKey.cs +++ b/src/Migrator/Framework/SchemaBuilder/ForeignKey.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class ForeignKey { diff --git a/src/Migrator/Framework/SchemaBuilder/IColumnOptions.cs b/src/Migrator/Framework/SchemaBuilder/IColumnOptions.cs index f30a9da8..0b28b6aa 100644 --- a/src/Migrator/Framework/SchemaBuilder/IColumnOptions.cs +++ b/src/Migrator/Framework/SchemaBuilder/IColumnOptions.cs @@ -1,6 +1,6 @@ using System.Data; -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public interface IColumnOptions { diff --git a/src/Migrator/Framework/SchemaBuilder/IDeleteTableOptions.cs b/src/Migrator/Framework/SchemaBuilder/IDeleteTableOptions.cs index 8b20d3cd..9b3581fd 100644 --- a/src/Migrator/Framework/SchemaBuilder/IDeleteTableOptions.cs +++ b/src/Migrator/Framework/SchemaBuilder/IDeleteTableOptions.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public interface IDeleteTableOptions { diff --git a/src/Migrator/Framework/SchemaBuilder/IFluentColumn.cs b/src/Migrator/Framework/SchemaBuilder/IFluentColumn.cs index ac8bcfbd..e5a90e0a 100644 --- a/src/Migrator/Framework/SchemaBuilder/IFluentColumn.cs +++ b/src/Migrator/Framework/SchemaBuilder/IFluentColumn.cs @@ -11,9 +11,7 @@ #endregion -using DotNetProjects.Migrator.Framework; - -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public interface IFluentColumn : IColumn { diff --git a/src/Migrator/Framework/SchemaBuilder/IForeignKeyOptions.cs b/src/Migrator/Framework/SchemaBuilder/IForeignKeyOptions.cs index d1fd0314..ecd4ecd8 100644 --- a/src/Migrator/Framework/SchemaBuilder/IForeignKeyOptions.cs +++ b/src/Migrator/Framework/SchemaBuilder/IForeignKeyOptions.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public interface IForeignKeyOptions { diff --git a/src/Migrator/Framework/SchemaBuilder/ISchemaBuilderExpression.cs b/src/Migrator/Framework/SchemaBuilder/ISchemaBuilderExpression.cs index cc086ba9..fe616f96 100644 --- a/src/Migrator/Framework/SchemaBuilder/ISchemaBuilderExpression.cs +++ b/src/Migrator/Framework/SchemaBuilder/ISchemaBuilderExpression.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public interface ISchemaBuilderExpression { diff --git a/src/Migrator/Framework/SchemaBuilder/RenameTableExpression.cs b/src/Migrator/Framework/SchemaBuilder/RenameTableExpression.cs index a6b8291d..15625861 100644 --- a/src/Migrator/Framework/SchemaBuilder/RenameTableExpression.cs +++ b/src/Migrator/Framework/SchemaBuilder/RenameTableExpression.cs @@ -11,7 +11,7 @@ #endregion -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class RenameTableExpression : ISchemaBuilderExpression { diff --git a/src/Migrator/Framework/SchemaBuilder/SchemaBuilder.cs b/src/Migrator/Framework/SchemaBuilder/SchemaBuilder.cs index 1faf923d..675e446b 100644 --- a/src/Migrator/Framework/SchemaBuilder/SchemaBuilder.cs +++ b/src/Migrator/Framework/SchemaBuilder/SchemaBuilder.cs @@ -14,9 +14,8 @@ using System; using System.Collections.Generic; using System.Data; -using DotNetProjects.Migrator.Framework; -namespace Migrator.Framework.SchemaBuilder; +namespace DotNetProjects.Migrator.Framework.SchemaBuilder; public class SchemaBuilder : IColumnOptions, IForeignKeyOptions, IDeleteTableOptions { diff --git a/src/Migrator/Framework/StringUtils.cs b/src/Migrator/Framework/StringUtils.cs index 31e5b62d..800ac738 100644 --- a/src/Migrator/Framework/StringUtils.cs +++ b/src/Migrator/Framework/StringUtils.cs @@ -1,7 +1,7 @@ using System.Text; using System.Text.RegularExpressions; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public class StringUtils { diff --git a/src/Migrator/Framework/Support/Inflector.cs b/src/Migrator/Framework/Support/Inflector.cs index a6f4f9d7..012b3ab9 100644 --- a/src/Migrator/Framework/Support/Inflector.cs +++ b/src/Migrator/Framework/Support/Inflector.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -namespace Migrator.Framework.Support; +namespace DotNetProjects.Migrator.Framework.Support; public class Inflector { diff --git a/src/Migrator/Framework/Support/TransformationProviderUtility.cs b/src/Migrator/Framework/Support/TransformationProviderUtility.cs index 001011ed..17b75b70 100644 --- a/src/Migrator/Framework/Support/TransformationProviderUtility.cs +++ b/src/Migrator/Framework/Support/TransformationProviderUtility.cs @@ -2,7 +2,7 @@ using System.Linq; using System.Reflection; -namespace Migrator.Framework.Support; +namespace DotNetProjects.Migrator.Framework.Support; public static class TransformationProviderUtility { @@ -66,7 +66,7 @@ public static string GetQualifiedResourcePath(Assembly assembly, string resource //resource full name is in format `namespace.resourceName` var sqlScriptParts = resourceName.Split('.').Reverse().ToArray(); #if NETSTANDARD - Func isNameMatch = x => x.Split('.').Reverse().Take(sqlScriptParts.Length).SequenceEqual(sqlScriptParts, StringComparer.CurrentCultureIgnoreCase); + Func isNameMatch = x => x.Split('.').Reverse().Take(sqlScriptParts.Length).SequenceEqual(sqlScriptParts, StringComparer.CurrentCultureIgnoreCase); #else Func isNameMatch = x => x.Split('.').Reverse().Take(sqlScriptParts.Length).SequenceEqual(sqlScriptParts, StringComparer.InvariantCultureIgnoreCase); #endif diff --git a/src/Migrator/Framework/Unique.cs b/src/Migrator/Framework/Unique.cs index b7508a6f..6ad3ce93 100644 --- a/src/Migrator/Framework/Unique.cs +++ b/src/Migrator/Framework/Unique.cs @@ -1,4 +1,4 @@ -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public class Unique : IDbField { diff --git a/src/Migrator/Framework/ViewColumn.cs b/src/Migrator/Framework/ViewColumn.cs index ad639553..5ed6b67a 100644 --- a/src/Migrator/Framework/ViewColumn.cs +++ b/src/Migrator/Framework/ViewColumn.cs @@ -1,6 +1,4 @@ -using System.Linq.Expressions; - -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public class ViewColumn : IViewElement { diff --git a/src/Migrator/Framework/ViewField.cs b/src/Migrator/Framework/ViewField.cs index aa59df1e..642a4b88 100644 --- a/src/Migrator/Framework/ViewField.cs +++ b/src/Migrator/Framework/ViewField.cs @@ -13,7 +13,7 @@ using System.Data; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; /// /// Represents a table column. diff --git a/src/Migrator/Framework/ViewJoin.cs b/src/Migrator/Framework/ViewJoin.cs index 15da6cc2..69dee6e3 100644 --- a/src/Migrator/Framework/ViewJoin.cs +++ b/src/Migrator/Framework/ViewJoin.cs @@ -1,6 +1,6 @@ using System.Linq.Expressions; -namespace Migrator.Framework; +namespace DotNetProjects.Migrator.Framework; public class ViewJoin : IViewElement { diff --git a/src/Migrator/IrreversibleMigrationException.cs b/src/Migrator/IrreversibleMigrationException.cs index d52d3c8b..f57e1b36 100644 --- a/src/Migrator/IrreversibleMigrationException.cs +++ b/src/Migrator/IrreversibleMigrationException.cs @@ -13,7 +13,7 @@ using System; -namespace Migrator; +namespace DotNetProjects.Migrator; /// /// Exception thrown in a migration Down() method diff --git a/src/Migrator/MigrateAnywhere.cs b/src/Migrator/MigrateAnywhere.cs index 06f97229..e0f7dcd0 100644 --- a/src/Migrator/MigrateAnywhere.cs +++ b/src/Migrator/MigrateAnywhere.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; -using Migrator.Framework; -using Migrator.Providers; using System.Reflection; +using DotNetProjects.Migrator.Providers; +using DotNetProjects.Migrator.Framework; -namespace Migrator; +namespace DotNetProjects.Migrator; /// /// Description of MigrateAnywhere. @@ -65,7 +65,7 @@ public override void Migrate(IMigration migration) { _provider.BeginTransaction(); #if NETSTANDARD - var attr = migration.GetType().GetTypeInfo().GetCustomAttribute(); + var attr = migration.GetType().GetTypeInfo().GetCustomAttribute(); #else var attr = (MigrationAttribute)Attribute.GetCustomAttribute(migration.GetType(), typeof(MigrationAttribute)); #endif diff --git a/src/Migrator/MigrationComparer.cs b/src/Migrator/MigrationComparer.cs index 5d3b8411..b0e2b0fc 100644 --- a/src/Migrator/MigrationComparer.cs +++ b/src/Migrator/MigrationComparer.cs @@ -13,10 +13,10 @@ using System; using System.Collections.Generic; -using Migrator.Framework; using System.Reflection; +using DotNetProjects.Migrator.Framework; -namespace Migrator; +namespace DotNetProjects.Migrator; /// /// Comparer of Migration by their version attribute. @@ -33,8 +33,8 @@ public MigrationTypeComparer(bool ascending) public int Compare(Type x, Type y) { #if NETSTANDARD - var attribOfX = x.GetTypeInfo().GetCustomAttribute(); - var attribOfY = y.GetTypeInfo().GetCustomAttribute(); + var attribOfX = x.GetTypeInfo().GetCustomAttribute(); + var attribOfY = y.GetTypeInfo().GetCustomAttribute(); #else var attribOfX = (MigrationAttribute)Attribute.GetCustomAttribute(x, typeof(MigrationAttribute)); var attribOfY = (MigrationAttribute)Attribute.GetCustomAttribute(y, typeof(MigrationAttribute)); diff --git a/src/Migrator/MigrationLoader.cs b/src/Migrator/MigrationLoader.cs index cdd162db..b3ef87bd 100644 --- a/src/Migrator/MigrationLoader.cs +++ b/src/Migrator/MigrationLoader.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Reflection; -using Migrator.Framework; using System.Linq; -using DotNetProjects.Migrator; +using DotNetProjects.Migrator.Framework; -namespace Migrator; +namespace DotNetProjects.Migrator; /// /// Handles inspecting code to find all of the Migrations in assemblies and reading @@ -111,11 +110,11 @@ public static List GetMigrationTypes(Assembly asm) #if NETSTANDARD - var attrib = t.GetTypeInfo().GetCustomAttribute(); - if (attrib != null && typeof(IMigration).GetTypeInfo().IsAssignableFrom(t) && !attrib.Ignore) - { - migrations.Add(t); - } + var attrib = t.GetTypeInfo().GetCustomAttribute(); + if (attrib != null && typeof(IMigration).GetTypeInfo().IsAssignableFrom(t) && !attrib.Ignore) + { + migrations.Add(t); + } #else var attrib = (MigrationAttribute)Attribute.GetCustomAttribute(t, typeof(MigrationAttribute)); if (attrib != null && typeof(IMigration).IsAssignableFrom(t) && !attrib.Ignore) diff --git a/src/Migrator/Migrator.cs b/src/Migrator/Migrator.cs index 4d6c600a..46fbd20b 100644 --- a/src/Migrator/Migrator.cs +++ b/src/Migrator/Migrator.cs @@ -15,11 +15,11 @@ using System.Collections.Generic; using System.Linq; using System.Reflection; -using Migrator.Framework; -using Migrator.Framework.Loggers; -using Migrator.Providers; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Framework.Loggers; +using DotNetProjects.Migrator.Providers; -namespace Migrator; +namespace DotNetProjects.Migrator; /// /// Migrations mediator. diff --git a/src/Migrator/ProviderFactory.cs b/src/Migrator/ProviderFactory.cs index 653f5e79..7e8cbdbb 100644 --- a/src/Migrator/ProviderFactory.cs +++ b/src/Migrator/ProviderFactory.cs @@ -15,20 +15,20 @@ using System.Collections.Generic; using System.Data; using System.Reflection; -using Migrator.Framework; -using Migrator.Providers; -using Migrator.Providers.Impl.DB2; -using Migrator.Providers.Impl.Firebird; -using Migrator.Providers.Impl.Informix; -using Migrator.Providers.Impl.Ingres; -using Migrator.Providers.Impl.Sybase; -using Migrator.Providers.Mysql; -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.DB2; +using DotNetProjects.Migrator.Providers.Impl.Firebird; +using DotNetProjects.Migrator.Providers.Impl.Informix; +using DotNetProjects.Migrator.Providers.Impl.Ingres; +using DotNetProjects.Migrator.Providers.Impl.Mysql; +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 DotNetProjects.Migrator.Providers.Impl.Sybase; -namespace Migrator; +namespace DotNetProjects.Migrator; /// /// Handles loading Provider implementations diff --git a/src/Migrator/Providers/ColumnPropertiesMapper.cs b/src/Migrator/Providers/ColumnPropertiesMapper.cs index 28fb4829..c996127d 100644 --- a/src/Migrator/Providers/ColumnPropertiesMapper.cs +++ b/src/Migrator/Providers/ColumnPropertiesMapper.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; /// /// This is basically a just a helper base class diff --git a/src/Migrator/Providers/DbProviderFactoriesHelper.cs b/src/Migrator/Providers/DbProviderFactoriesHelper.cs index 2dede513..651d8f78 100644 --- a/src/Migrator/Providers/DbProviderFactoriesHelper.cs +++ b/src/Migrator/Providers/DbProviderFactoriesHelper.cs @@ -2,9 +2,8 @@ using System.Collections.Generic; using System.Data.Common; using System.Linq; -using System.Text; -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; public static class DbProviderFactoriesHelper { @@ -36,7 +35,7 @@ public static DbProviderFactory GetFactory(string providerName, string assemblyN #endif #if NETSTANDARD - return null; + return null; #else return (DbProviderFactory)AppDomain.CurrentDomain.CreateInstanceAndUnwrap(assemblyName, factoryProviderType); #endif diff --git a/src/Migrator/Providers/Dialect.cs b/src/Migrator/Providers/Dialect.cs index fab02c60..d66ae1fc 100644 --- a/src/Migrator/Providers/Dialect.cs +++ b/src/Migrator/Providers/Dialect.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; /// /// Defines the implementations specific details for a particular database. @@ -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; diff --git a/src/Migrator/Providers/ForeignKeyConstraintMapper.cs b/src/Migrator/Providers/ForeignKeyConstraintMapper.cs index 5613a5c1..2249b28d 100644 --- a/src/Migrator/Providers/ForeignKeyConstraintMapper.cs +++ b/src/Migrator/Providers/ForeignKeyConstraintMapper.cs @@ -1,6 +1,6 @@ using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; public class ForeignKeyConstraintMapper { diff --git a/src/Migrator/Providers/Impl/DB2/DB2Dialect.cs b/src/Migrator/Providers/Impl/DB2/DB2Dialect.cs index 3c9bdda8..2c0f6923 100644 --- a/src/Migrator/Providers/Impl/DB2/DB2Dialect.cs +++ b/src/Migrator/Providers/Impl/DB2/DB2Dialect.cs @@ -1,8 +1,7 @@ using System.Data; +using DotNetProjects.Migrator.Framework; -using Migrator.Framework; - -namespace Migrator.Providers.Impl.DB2; +namespace DotNetProjects.Migrator.Providers.Impl.DB2; public class DB2Dialect : Dialect { diff --git a/src/Migrator/Providers/Impl/DB2/DB2TransformationProvider.cs b/src/Migrator/Providers/Impl/DB2/DB2TransformationProvider.cs index 15a115ca..56c72f12 100644 --- a/src/Migrator/Providers/Impl/DB2/DB2TransformationProvider.cs +++ b/src/Migrator/Providers/Impl/DB2/DB2TransformationProvider.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Data; +using DotNetProjects.Migrator.Providers; -namespace Migrator.Providers.Impl.DB2; +namespace DotNetProjects.Migrator.Providers.Impl.DB2; /// /// DB2 transformation provider diff --git a/src/Migrator/Providers/Impl/Firebird/FirebirdColumnPropertiesMapper.cs b/src/Migrator/Providers/Impl/Firebird/FirebirdColumnPropertiesMapper.cs index 7cd574de..9d082da0 100644 --- a/src/Migrator/Providers/Impl/Firebird/FirebirdColumnPropertiesMapper.cs +++ b/src/Migrator/Providers/Impl/Firebird/FirebirdColumnPropertiesMapper.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Providers; -namespace Migrator.Providers.Impl.Firebird; +namespace DotNetProjects.Migrator.Providers.Impl.Firebird; public class FirebirdColumnPropertiesMapper : ColumnPropertiesMapper { diff --git a/src/Migrator/Providers/Impl/Firebird/FirebirdDialect.cs b/src/Migrator/Providers/Impl/Firebird/FirebirdDialect.cs index a178e47c..47b8f648 100644 --- a/src/Migrator/Providers/Impl/Firebird/FirebirdDialect.cs +++ b/src/Migrator/Providers/Impl/Firebird/FirebirdDialect.cs @@ -1,8 +1,8 @@ using System; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Impl.Firebird; +namespace DotNetProjects.Migrator.Providers.Impl.Firebird; public class FirebirdDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/Firebird/FirebirdTransformationProvider.cs b/src/Migrator/Providers/Impl/Firebird/FirebirdTransformationProvider.cs index 524bd9b2..a56277eb 100644 --- a/src/Migrator/Providers/Impl/Firebird/FirebirdTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Firebird/FirebirdTransformationProvider.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.Data; using System.Linq; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Providers; -namespace Migrator.Providers.Impl.Firebird; +namespace DotNetProjects.Migrator.Providers.Impl.Firebird; /// /// Firebird transformation provider diff --git a/src/Migrator/Providers/Impl/Informix/InformixDialect.cs b/src/Migrator/Providers/Impl/Informix/InformixDialect.cs index 39accf4f..9a93fff3 100644 --- a/src/Migrator/Providers/Impl/Informix/InformixDialect.cs +++ b/src/Migrator/Providers/Impl/Informix/InformixDialect.cs @@ -1,8 +1,7 @@ using System.Data; +using DotNetProjects.Migrator.Framework; -using Migrator.Framework; - -namespace Migrator.Providers.Impl.Informix; +namespace DotNetProjects.Migrator.Providers.Impl.Informix; public class InformixDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/Informix/InformixTransformationProvider.cs b/src/Migrator/Providers/Impl/Informix/InformixTransformationProvider.cs index 8e0b42fc..b8657821 100644 --- a/src/Migrator/Providers/Impl/Informix/InformixTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Informix/InformixTransformationProvider.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Data; +using DotNetProjects.Migrator.Providers; -namespace Migrator.Providers.Impl.Informix; +namespace DotNetProjects.Migrator.Providers.Impl.Informix; /// /// DB2 transformation provider diff --git a/src/Migrator/Providers/Impl/Ingres/IngresDialect.cs b/src/Migrator/Providers/Impl/Ingres/IngresDialect.cs index ac896715..a6ce8103 100644 --- a/src/Migrator/Providers/Impl/Ingres/IngresDialect.cs +++ b/src/Migrator/Providers/Impl/Ingres/IngresDialect.cs @@ -1,7 +1,7 @@ using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Impl.Ingres; +namespace DotNetProjects.Migrator.Providers.Impl.Ingres; public class IngresDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/Ingres/IngresTransformationProvider.cs b/src/Migrator/Providers/Impl/Ingres/IngresTransformationProvider.cs index 44e10cad..80c50d04 100644 --- a/src/Migrator/Providers/Impl/Ingres/IngresTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Ingres/IngresTransformationProvider.cs @@ -1,8 +1,9 @@ using System; using System.Collections.Generic; using System.Data; +using DotNetProjects.Migrator.Providers; -namespace Migrator.Providers.Impl.Ingres; +namespace DotNetProjects.Migrator.Providers.Impl.Ingres; public class IngresTransformationProvider : TransformationProvider { diff --git a/src/Migrator/Providers/Impl/Mysql/MariaDBDialect.cs b/src/Migrator/Providers/Impl/Mysql/MariaDBDialect.cs index 9e1fb1ef..2f8f614b 100644 --- a/src/Migrator/Providers/Impl/Mysql/MariaDBDialect.cs +++ b/src/Migrator/Providers/Impl/Mysql/MariaDBDialect.cs @@ -1,7 +1,7 @@ using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Mysql; +namespace DotNetProjects.Migrator.Providers.Impl.Mysql; public class MariaDBDialect : MysqlDialect { diff --git a/src/Migrator/Providers/Impl/Mysql/MariaDBTransformationProvider.cs b/src/Migrator/Providers/Impl/Mysql/MariaDBTransformationProvider.cs index df20bf06..a8ef9397 100644 --- a/src/Migrator/Providers/Impl/Mysql/MariaDBTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Mysql/MariaDBTransformationProvider.cs @@ -1,6 +1,6 @@ using System.Data; -namespace Migrator.Providers.Mysql; +namespace DotNetProjects.Migrator.Providers.Impl.Mysql; /// /// MySql transformation provider diff --git a/src/Migrator/Providers/Impl/Mysql/MySqlTransformationProvider.cs b/src/Migrator/Providers/Impl/Mysql/MySqlTransformationProvider.cs index d23ccd7c..7491d2d8 100644 --- a/src/Migrator/Providers/Impl/Mysql/MySqlTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Mysql/MySqlTransformationProvider.cs @@ -1,11 +1,11 @@ -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; using System; using System.Collections.Generic; using System.Data; using System.Globalization; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; -namespace Migrator.Providers.Mysql; +namespace DotNetProjects.Migrator.Providers.Impl.Mysql; /// /// MySql transformation provider diff --git a/src/Migrator/Providers/Impl/Mysql/MysqlDialect.cs b/src/Migrator/Providers/Impl/Mysql/MysqlDialect.cs index 341f102c..fa51e466 100644 --- a/src/Migrator/Providers/Impl/Mysql/MysqlDialect.cs +++ b/src/Migrator/Providers/Impl/Mysql/MysqlDialect.cs @@ -1,8 +1,7 @@ -using System; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Mysql; +namespace DotNetProjects.Migrator.Providers.Impl.Mysql; public class MysqlDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/Oracle/MsOracleDialect.cs b/src/Migrator/Providers/Impl/Oracle/MsOracleDialect.cs index ca5a4bb3..4aa8f94c 100644 --- a/src/Migrator/Providers/Impl/Oracle/MsOracleDialect.cs +++ b/src/Migrator/Providers/Impl/Oracle/MsOracleDialect.cs @@ -1,8 +1,7 @@ using System.Data; -using DotNetProjects.Migrator.Providers.Impl.Oracle; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Oracle; +namespace DotNetProjects.Migrator.Providers.Impl.Oracle; public class MsOracleDialect : OracleDialect { diff --git a/src/Migrator/Providers/Impl/Oracle/MsOracleTransformationProvider.cs b/src/Migrator/Providers/Impl/Oracle/MsOracleTransformationProvider.cs index 43ea9c52..04ff1094 100644 --- a/src/Migrator/Providers/Impl/Oracle/MsOracleTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Oracle/MsOracleTransformationProvider.cs @@ -1,5 +1,4 @@ using System.Data; -using Migrator.Providers; namespace DotNetProjects.Migrator.Providers.Impl.Oracle; diff --git a/src/Migrator/Providers/Impl/Oracle/OracleColumnPropertiesMapper.cs b/src/Migrator/Providers/Impl/Oracle/OracleColumnPropertiesMapper.cs index b6d30a37..cfa6c023 100644 --- a/src/Migrator/Providers/Impl/Oracle/OracleColumnPropertiesMapper.cs +++ b/src/Migrator/Providers/Impl/Oracle/OracleColumnPropertiesMapper.cs @@ -1,8 +1,7 @@ -using System; -using System.Collections.Generic; -using Migrator.Framework; +using System.Collections.Generic; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Impl.Oracle; +namespace DotNetProjects.Migrator.Providers.Impl.Oracle; public class OracleColumnPropertiesMapper : ColumnPropertiesMapper { diff --git a/src/Migrator/Providers/Impl/Oracle/OracleDialect.cs b/src/Migrator/Providers/Impl/Oracle/OracleDialect.cs index ab94a2da..cb51faf3 100644 --- a/src/Migrator/Providers/Impl/Oracle/OracleDialect.cs +++ b/src/Migrator/Providers/Impl/Oracle/OracleDialect.cs @@ -1,10 +1,8 @@ using System; using System.Data; -using DotNetProjects.Migrator.Providers.Impl.Oracle; -using Migrator.Framework; -using Migrator.Providers.Impl.Oracle; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Oracle; +namespace DotNetProjects.Migrator.Providers.Impl.Oracle; public class OracleDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/Oracle/OracleTransformationProvider.cs b/src/Migrator/Providers/Impl/Oracle/OracleTransformationProvider.cs index 23c4246f..f8795cff 100644 --- a/src/Migrator/Providers/Impl/Oracle/OracleTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Oracle/OracleTransformationProvider.cs @@ -1,7 +1,5 @@ using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Models; -using Migrator.Framework; -using Migrator.Providers; using System; using System.Collections.Generic; using System.Data; @@ -9,7 +7,7 @@ using System.Linq; using System.Text; using ForeignKeyConstraint = DotNetProjects.Migrator.Framework.ForeignKeyConstraint; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; namespace DotNetProjects.Migrator.Providers.Impl.Oracle; diff --git a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQL82Dialect.cs b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQL82Dialect.cs index f826b086..08b87424 100644 --- a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQL82Dialect.cs +++ b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQL82Dialect.cs @@ -1,6 +1,6 @@ using System.Data; -namespace Migrator.Providers.PostgreSQL; +namespace DotNetProjects.Migrator.Providers.Impl.PostgreSQL; public class PostgreSQL82Dialect : PostgreSQLDialect { diff --git a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLDialect.cs b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLDialect.cs index ca842dff..9923db1f 100644 --- a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLDialect.cs +++ b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLDialect.cs @@ -1,8 +1,7 @@ -using Migrator.Framework; -using System; +using DotNetProjects.Migrator.Framework; using System.Data; -namespace Migrator.Providers.PostgreSQL; +namespace DotNetProjects.Migrator.Providers.Impl.PostgreSQL; public class PostgreSQLDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs index 55d02b44..c6f391ab 100644 --- a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs @@ -12,14 +12,13 @@ #endregion using DotNetProjects.Migrator.Framework; -using Migrator.Framework; using System; using System.Collections.Generic; using System.Data; using System.Globalization; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; -namespace Migrator.Providers.PostgreSQL; +namespace DotNetProjects.Migrator.Providers.Impl.PostgreSQL; /// /// Migration transformations provider for PostgreSql (using NPGSql .Net driver) diff --git a/src/Migrator/Providers/Impl/SQLite/Models/SQLiteTableInfo.cs b/src/Migrator/Providers/Impl/SQLite/Models/SQLiteTableInfo.cs index 35283b54..e2512c77 100644 --- a/src/Migrator/Providers/Impl/SQLite/Models/SQLiteTableInfo.cs +++ b/src/Migrator/Providers/Impl/SQLite/Models/SQLiteTableInfo.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using DotNetProjects.Migrator.Framework; -using Migrator.Framework; namespace DotNetProjects.Migrator.Providers.Impl.SQLite.Models; diff --git a/src/Migrator/Providers/Impl/SQLite/SQLiteColumnPropertiesMapper.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteColumnPropertiesMapper.cs index 09c504b9..a645f025 100644 --- a/src/Migrator/Providers/Impl/SQLite/SQLiteColumnPropertiesMapper.cs +++ b/src/Migrator/Providers/Impl/SQLite/SQLiteColumnPropertiesMapper.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; -using Migrator.Framework; -using Migrator.Providers; +using DotNetProjects.Migrator.Framework; namespace DotNetProjects.Migrator.Providers.Impl.SQLite; diff --git a/src/Migrator/Providers/Impl/SQLite/SQLiteDialect.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteDialect.cs index 53b90ad5..d4036da3 100644 --- a/src/Migrator/Providers/Impl/SQLite/SQLiteDialect.cs +++ b/src/Migrator/Providers/Impl/SQLite/SQLiteDialect.cs @@ -1,9 +1,7 @@ -using System; using System.Data; -using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.SQLite; +namespace DotNetProjects.Migrator.Providers.Impl.SQLite; public class SQLiteDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/SQLite/SQLiteMonoDialect.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteMonoDialect.cs index 3075f41f..1efaf015 100644 --- a/src/Migrator/Providers/Impl/SQLite/SQLiteMonoDialect.cs +++ b/src/Migrator/Providers/Impl/SQLite/SQLiteMonoDialect.cs @@ -1,7 +1,6 @@ -using DotNetProjects.Migrator.Providers.Impl.SQLite; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.SQLite; +namespace DotNetProjects.Migrator.Providers.Impl.SQLite; public class SQLiteMonoDialect : SQLiteDialect { diff --git a/src/Migrator/Providers/Impl/SQLite/SQLiteMonoTransformationProvider.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteMonoTransformationProvider.cs index 5306afb6..442ce083 100644 --- a/src/Migrator/Providers/Impl/SQLite/SQLiteMonoTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/SQLite/SQLiteMonoTransformationProvider.cs @@ -1,6 +1,4 @@ using System.Data; -using Migrator.Providers; -using Migrator.Providers.SQLite; namespace DotNetProjects.Migrator.Providers.Impl.SQLite; diff --git a/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs index 807372db..0eddfc56 100644 --- a/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs @@ -1,7 +1,5 @@ using DotNetProjects.Migrator.Framework; using DotNetProjects.Migrator.Providers.Impl.SQLite.Models; -using Migrator.Framework; -using Migrator.Providers; using System; using System.Collections.Generic; using System.Data; @@ -10,7 +8,7 @@ using System.Text; using System.Text.RegularExpressions; using ForeignKeyConstraint = DotNetProjects.Migrator.Framework.ForeignKeyConstraint; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; namespace DotNetProjects.Migrator.Providers.Impl.SQLite; @@ -513,6 +511,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 +581,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 +697,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 +759,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 +1011,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 +1088,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(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 +1114,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().ToArray(); diff --git a/src/Migrator/Providers/Impl/SqlServer/SqlServer2005Dialect.cs b/src/Migrator/Providers/Impl/SqlServer/SqlServer2005Dialect.cs index c8c29dda..c5bf9285 100644 --- a/src/Migrator/Providers/Impl/SqlServer/SqlServer2005Dialect.cs +++ b/src/Migrator/Providers/Impl/SqlServer/SqlServer2005Dialect.cs @@ -1,7 +1,7 @@ using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.SqlServer; +namespace DotNetProjects.Migrator.Providers.Impl.SqlServer; public class SqlServer2005Dialect : SqlServerDialect { diff --git a/src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs b/src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs index cfdd2f21..2f2885a9 100644 --- a/src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs +++ b/src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs @@ -1,8 +1,8 @@ using System; using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.SqlServer; +namespace DotNetProjects.Migrator.Providers.Impl.SqlServer; public class SqlServerDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs b/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs index 00726572..759ef8de 100644 --- a/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs @@ -12,14 +12,13 @@ #endregion using DotNetProjects.Migrator.Framework; -using Migrator.Framework; using System; using System.Collections.Generic; using System.Data; using System.Globalization; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; -namespace Migrator.Providers.SqlServer; +namespace DotNetProjects.Migrator.Providers.Impl.SqlServer; /// /// Migration transformations provider for Microsoft SQL Server. diff --git a/src/Migrator/Providers/Impl/Sybase/SybaseDialect.cs b/src/Migrator/Providers/Impl/Sybase/SybaseDialect.cs index 4a24f8f7..a8bbdf13 100644 --- a/src/Migrator/Providers/Impl/Sybase/SybaseDialect.cs +++ b/src/Migrator/Providers/Impl/Sybase/SybaseDialect.cs @@ -1,7 +1,7 @@ using System.Data; -using Migrator.Framework; +using DotNetProjects.Migrator.Framework; -namespace Migrator.Providers.Impl.Sybase; +namespace DotNetProjects.Migrator.Providers.Impl.Sybase; public class SybaseDialect : Dialect { diff --git a/src/Migrator/Providers/Impl/Sybase/SybaseTransformationProvider.cs b/src/Migrator/Providers/Impl/Sybase/SybaseTransformationProvider.cs index 2b7c7b6a..46464db2 100644 --- a/src/Migrator/Providers/Impl/Sybase/SybaseTransformationProvider.cs +++ b/src/Migrator/Providers/Impl/Sybase/SybaseTransformationProvider.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Data; -namespace Migrator.Providers.Impl.Sybase; +namespace DotNetProjects.Migrator.Providers.Impl.Sybase; public class SybaseTransformationProvider : TransformationProvider { diff --git a/src/Migrator/Providers/NoOpTransformationProvider.cs b/src/Migrator/Providers/NoOpTransformationProvider.cs index eb9f4ec0..b8c27e51 100644 --- a/src/Migrator/Providers/NoOpTransformationProvider.cs +++ b/src/Migrator/Providers/NoOpTransformationProvider.cs @@ -2,13 +2,11 @@ using System.Collections.Generic; using System.Data; using DotNetProjects.Migrator.Framework; -using Migrator.Framework; -using Migrator.Framework.SchemaBuilder; - +using DotNetProjects.Migrator.Framework.SchemaBuilder; using ForeignKeyConstraint = DotNetProjects.Migrator.Framework.ForeignKeyConstraint; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; /// /// No Op (Null Object Pattern) implementation of the ITransformationProvider diff --git a/src/Migrator/Providers/ProviderTypes.cs b/src/Migrator/Providers/ProviderTypes.cs index 5c125885..7a7dbcba 100644 --- a/src/Migrator/Providers/ProviderTypes.cs +++ b/src/Migrator/Providers/ProviderTypes.cs @@ -1,4 +1,4 @@ -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; public enum ProviderTypes { diff --git a/src/Migrator/Providers/TransformationProvider.cs b/src/Migrator/Providers/TransformationProvider.cs index 9786273f..a1958201 100644 --- a/src/Migrator/Providers/TransformationProvider.cs +++ b/src/Migrator/Providers/TransformationProvider.cs @@ -12,11 +12,10 @@ #endregion using DotNetProjects.Migrator.Framework; +using DotNetProjects.Migrator.Framework.Loggers; +using DotNetProjects.Migrator.Framework.SchemaBuilder; +using DotNetProjects.Migrator.Framework.Support; using DotNetProjects.Migrator.Providers.Models; -using Migrator.Framework; -using Migrator.Framework.Loggers; -using Migrator.Framework.SchemaBuilder; -using Migrator.Framework.Support; using System; using System.Collections.Generic; using System.Data; @@ -27,9 +26,9 @@ using System.Text; using ForeignKeyConstraint = DotNetProjects.Migrator.Framework.ForeignKeyConstraint; using ForeignKeyConstraintType = DotNetProjects.Migrator.Framework.ForeignKeyConstraintType; -using Index = Migrator.Framework.Index; +using Index = DotNetProjects.Migrator.Framework.Index; -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; /// /// Base class for every transformation providers. diff --git a/src/Migrator/Providers/TypeNames.cs b/src/Migrator/Providers/TypeNames.cs index 0307126d..8f0944d0 100644 --- a/src/Migrator/Providers/TypeNames.cs +++ b/src/Migrator/Providers/TypeNames.cs @@ -2,10 +2,9 @@ using System.Collections.Generic; using System.Data; using System.Linq; +using DotNetProjects.Migrator.Framework; -using Migrator.Framework; - -namespace Migrator.Providers; +namespace DotNetProjects.Migrator.Providers; /// /// This class maps a DbType to names. diff --git a/src/Migrator/Providers/Utility/SqlServerUtility.cs b/src/Migrator/Providers/Utility/SqlServerUtility.cs index 16c3a9b3..eb477467 100644 --- a/src/Migrator/Providers/Utility/SqlServerUtility.cs +++ b/src/Migrator/Providers/Utility/SqlServerUtility.cs @@ -1,7 +1,7 @@ -using Migrator.Providers.SqlServer; -using System.Data; +using System.Data; +using DotNetProjects.Migrator.Providers.Impl.SqlServer; -namespace Migrator.Providers.Utility; +namespace DotNetProjects.Migrator.Providers.Utility; public static class SqlServerUtility { diff --git a/src/Migrator/Tools/SchemaDumper.cs b/src/Migrator/Tools/SchemaDumper.cs index 06ebb630..c6521d8e 100755 --- a/src/Migrator/Tools/SchemaDumper.cs +++ b/src/Migrator/Tools/SchemaDumper.cs @@ -15,12 +15,12 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using DotNetProjects.Migrator; using DotNetProjects.Migrator.Framework; -using Migrator.Framework; -using Migrator.Providers; -using Index = Migrator.Framework.Index; +using DotNetProjects.Migrator.Providers; +using Index = DotNetProjects.Migrator.Framework.Index; -namespace Migrator.Tools; +namespace DotNetProjects.Migrator.Tools; public class SchemaDumper {