Refactoring

Ja bist du narrisch · Ja bist du narrisch · commit 4b75e5c061af · 2025-07-30T14:11:28.000+02:00
diff --git a/doc/ReleaseNotes.md b/doc/ReleaseNotes.md
@@ -0,0 +1,11 @@
+# Release Notes
+
+## 7.0.159 - 7.0.209 (Nuget Version)
+### Breaking Changes
++ Minimum SQLite Version: 3.8.2 (2013-12-06)
+
+#### ColumnProperty
++ Removed `ForeignKey` use method `AddForeignKey(...)` instead.
+
+### Other changes
+Added `ColumnProperty.Clustered` and `ColumnProperty.NonClustered` 
diff --git a/src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyTests.cs b/src/Migrator.Tests/Framework/ColumnProperties/ColumnPropertyTests.cs
@@ -1,5 +1,9 @@
 using Migrator.Framework;
 using NUnit.Framework;
+using DotNetProjects.Migrator.Framework;
+using System;
+using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Migrator.Tests.Framework.ColumnProperties;
 
@@ -9,12 +13,38 @@ public class ColumnPropertyExtensionsTests
     public void Clear()
     {
         // Arrange
-        var columnProperty = ColumnProperty.PrimaryKey | ColumnProperty.Unique;
+        var columnProperty = ColumnProperty.PrimaryKey | ColumnProperty.NotNull;
 
         // Act
         columnProperty = columnProperty.Clear(ColumnProperty.PrimaryKey);
 
         // Assert
         Assert.That(columnProperty.HasFlag(ColumnProperty.PrimaryKey), Is.False);
     }
+
+    [Test]
+    public void IsSet()
+    {
+        // Arrange
+        var columnProperty = ColumnProperty.PrimaryKey | ColumnProperty.NotNull;
+
+        // Act
+        var isSetInfos = GetAllSingleColumnProperties().Select(x => new
+        {
+            ColumnPropertyString = x.ToString(),
+            IsSet = columnProperty.IsSet(x),
+            IsNotSet = columnProperty.IsNotSet(x)
+        }).Where(x => x.ColumnPropertyString != ColumnProperty.None.ToString());
+
+        // Assert
+        string[] expectedSet = [nameof(ColumnProperty.PrimaryKey), nameof(ColumnProperty.NotNull)];
+        var isSetInfosSet = isSetInfos.Where(x => expectedSet.Any(y => y == x.ColumnPropertyString)).ToList();
+
+        Assert.That(isSetInfos.Select(x => x.IsSet), Has.All.True);
+    }
+
+    private ColumnProperty[] GetAllSingleColumnProperties()
+    {
+        return [.. Enum.GetValues<ColumnProperty>().Where(x => x == 0 || (x & (x - 1)) == 0)];
+    }
 }
diff --git a/src/Migrator.Tests/Providers/GenericProviderTests.cs b/src/Migrator.Tests/Providers/GenericProviderTests.cs
@@ -3,40 +3,39 @@
 using Migrator.Providers;
 using NUnit.Framework;
 
-namespace Migrator.Tests.Providers
+namespace Migrator.Tests.Providers;
+
+[TestFixture]
+public class GenericProviderTests
+{
+    [Test]
+    public void CanJoinColumnsAndValues()
+    {
+        var provider = new GenericTransformationProvider();
+        var result = provider.JoinColumnsAndValues(["foo", "bar"], ["123", "456"]);
+
+        Assert.That("foo='123', bar='456'", Is.EqualTo(result));
+    }
+}
+
+internal class GenericTransformationProvider : TransformationProvider
 {
-    [TestFixture]
-    public class GenericProviderTests
+    public GenericTransformationProvider() : base(null, null as string, null, "default")
+    {
+    }
+
+    public override bool ConstraintExists(string table, string name)
+    {
+        return false;
+    }
+
+    public override List<string> GetDatabases()
     {
-        [Test]
-        public void CanJoinColumnsAndValues()
-        {
-            var provider = new GenericTransformationProvider();
-            string result = provider.JoinColumnsAndValues(new[] { "foo", "bar" }, new[] { "123", "456" });
-
-            Assert.That("foo='123', bar='456'", Is.EqualTo(result));
-        }
+        throw new System.NotImplementedException();
     }
 
-    internal class GenericTransformationProvider : TransformationProvider
+    public override bool IndexExists(string table, string name)
     {
-        public GenericTransformationProvider() : base(null, null as string, null, "default")
-        {
-        }
-
-        public override bool ConstraintExists(string table, string name)
-        {
-            return false;
-        }
-
-        public override List<string> GetDatabases()
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public override bool IndexExists(string table, string name)
-        {
-            return false;
-        }
+        return false;
     }
 }
diff --git a/src/Migrator.Tests/Providers/Oracle/OracleTransformationProviderTest.cs b/src/Migrator.Tests/Providers/Oracle/OracleTransformationProviderTest.cs
diff --git a/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTestBase.cs b/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTestBase.cs
@@ -0,0 +1,25 @@
+using Migrator.Providers.SqlServer;
+using Migrator.Tests.Providers.Base;
+using Migrator.Tests.Settings;
+using Migrator.Tests.Settings.Config;
+using NUnit.Framework;
+
+namespace Migrator.Tests.Providers.SQLServer.Base;
+
+[TestFixture]
+[Category("SQLServer")]
+public abstract class SQLiteTransformationProviderTestBase : TransformationProviderSimpleBase
+{
+    [SetUp]
+    public void SetUp()
+    {
+        var configReader = new ConfigurationReader();
+        var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteConnectionConfigId)
+            .ConnectionString;
+
+        Provider = new SqlServerTransformationProvider(new SqlServerDialect(), connectionString, null, "default", null);
+        Provider.BeginTransaction();
+
+        AddDefaultTable();
+    }
+}
diff --git a/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTest.cs b/src/Migrator.Tests/Providers/SQLServer/SqlServerTransformationProviderTest.cs
@@ -18,7 +18,7 @@
 using Migrator.Providers.SqlServer;
 using NUnit.Framework;
 
-namespace Migrator.Tests.Providers;
+namespace Migrator.Tests.Providers.SQLServer;
 
 [TestFixture]
 [Category("SqlServer")]
@@ -29,13 +29,7 @@ public class SqlServerTransformationProviderTest : TransformationProviderConstra
     [SetUp]
     public void SetUp()
     {
-        var constr = ConfigurationManager.AppSettings["SqlServerConnectionString"];
-
-        if (constr == null)
-        {
-            throw new ArgumentNullException("SqlServerConnectionString", "No config file");
-        }
-
+        var constr = ConfigurationManager.AppSettings["SqlServerConnectionString"] ?? throw new ArgumentNullException("SqlServerConnectionString", "No config file");
         Provider = new SqlServerTransformationProvider(new SqlServerDialect(), constr, null, "default", null);
         Provider.BeginTransaction();
 
diff --git a/src/Migrator.Tests/Providers/SQLServer2005/SqlServer2005TransformationProviderTest.cs b/src/Migrator.Tests/Providers/SQLServer2005/SqlServer2005TransformationProviderTest.cs
diff --git a/src/Migrator.Tests/Providers/SQLServerCe/SqlServerCeTransformationProviderTest.cs b/src/Migrator.Tests/Providers/SQLServerCe/SqlServerCeTransformationProviderTest.cs
diff --git a/src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs b/src/Migrator.Tests/Providers/SQLite/Base/SQLiteTransformationProviderTestBase.cs
@@ -2,6 +2,7 @@
 using Migrator.Providers.SQLite;
 using Migrator.Tests.Providers.Base;
 using Migrator.Tests.Settings;
+using Migrator.Tests.Settings.Config;
 using NUnit.Framework;
 
 namespace Migrator.Tests.Providers.SQLite.Base;
@@ -14,7 +15,7 @@ public abstract class SQLiteTransformationProviderTestBase : TransformationProvi
     public void SetUp()
     {
         var configReader = new ConfigurationReader();
-        var connectionString = configReader.GetDatabaseConnectionConfigById("SQLiteConnectionString")
+        var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteConnectionConfigId)
             .ConnectionString;
 
         Provider = new SQLiteTransformationProvider(new SQLiteDialect(), connectionString, "default", null);
diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProvider_GetColumnsTests.cs
@@ -36,6 +36,8 @@ public void GetColumns_PrimaryAndUnique_ReturnsFalse()
 
         // Assert
         Assert.That(columns.Single().ColumnProperty, Is.EqualTo(
+            ColumnProperty.NotNull |
+            ColumnProperty.Identity |
             ColumnProperty.Unique |
             ColumnProperty.PrimaryKey));
     }
@@ -52,23 +54,9 @@ public void GetColumns_Primary_ColumnPropertyOk()
         var columns = Provider.GetColumns(tableName);
 
         // Assert
-        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey));
-    }
-
-    [Test]
-    public void GetColumns_PrimaryKey_ContainsPrimaryKey()
-    {
-        // Arrange
-        const string tableName = "GetColumnsTest";
-        Provider.AddTable(tableName, new Column("Id", System.Data.DbType.Int32, ColumnProperty.PrimaryKey));
-
-        Provider.GetColumns(tableName);
-
-        // Act
-        var columns = Provider.GetColumns(tableName);
-
-        // Assert
-        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey));
+        Assert.That(columns.Single().ColumnProperty, Is.EqualTo(ColumnProperty.NotNull |
+            ColumnProperty.Identity |
+            ColumnProperty.PrimaryKey));
     }
 
     [Test]
@@ -88,7 +76,7 @@ public void GetColumns_PrimaryKeyOnTwoColumns_BothColumnsHavePrimaryKeyAndAreNot
         var columns = Provider.GetColumns(tableName);
 
         // Assert
-        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
+        Assert.That(columns[0].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull | ColumnProperty.Identity));
         Assert.That(columns[1].ColumnProperty, Is.EqualTo(ColumnProperty.PrimaryKey | ColumnProperty.NotNull));
     }
 
diff --git a/src/Migrator.Tests/Settings/Config/ConnectionIds.cs b/src/Migrator.Tests/Settings/Config/ConnectionIds.cs
@@ -0,0 +1,9 @@
+namespace Migrator.Tests.Settings.Config;
+
+public static class DatabaseConnectionConfigIds
+{
+    public const string Oracle = "Oracle";
+    public const string PostgreSQL = "PostgreSQL";
+    public const string SQLiteConnectionConfigId = "SQLite";
+    public const string SQLServerConnectionConfigId = "SQLServer";
+}
diff --git a/src/Migrator.Tests/appsettings.json b/src/Migrator.Tests/appsettings.json
@@ -1,8 +1,7 @@
 {
-    "DatabaseConnectionConfigs": 
-    [
+    "DatabaseConnectionConfigs": [
         {
-            "Id": "SQLiteConnectionString",
+            "Id": "SQLite",
             "ConnectionString": "Data Source=:memory:;version=3"
         }
     ]
diff --git a/src/Migrator/Framework/ColumnProperty.cs b/src/Migrator/Framework/ColumnProperty.cs
@@ -46,48 +46,25 @@ public enum ColumnProperty
         /// </summary>
         CaseSensitive = 1 << 6,
 
-        /// <summary>
-        /// Foreign Key
-        /// </summary>
-        [Obsolete("Use method 'AddForeignKey' instead. The flag does not make sense on column level.")]
-        ForeignKey = 1 << 7,
+        // /// <summary>
+        // /// Foreign Key
+        // /// </summary>
+        // [Obsolete("Use method 'AddForeignKey' instead. The flag does not make sense on column level.")]
+        // ForeignKey = 1 << 7,
 
         /// <summary>
-        /// Primary Key
+        /// Primary Key.
         /// </summary>
         PrimaryKey = 1 << 8,
 
         /// <summary>
-        /// Primary key with identity. Will be removed soon.
+        /// Primary key with identity. This is shorthand for <see cref="PrimaryKey"/> and <see cref="Identity"/>
         /// </summary>
         PrimaryKeyWithIdentity = 1 << 9 | PrimaryKey | Identity,
 
         /// <summary>
-        /// Primary key. Will be removed soon.
+        /// Primary key non clustered. 
         /// </summary>
         PrimaryKeyNonClustered = 1 << 10 | PrimaryKey
     }
-
-    public static class ColumnPropertyExtensions
-    {
-        public static bool IsSet(this ColumnProperty fruits, ColumnProperty flags)
-        {
-            return (fruits & flags) == flags;
-        }
-
-        public static bool IsNotSet(this ColumnProperty fruits, ColumnProperty flags)
-        {
-            return (fruits & (~flags)) == 0;
-        }
-
-        public static ColumnProperty Set(this ColumnProperty fruits, ColumnProperty flags)
-        {
-            return fruits | flags;
-        }
-
-        public static ColumnProperty Clear(this ColumnProperty fruits, ColumnProperty flags)
-        {
-            return fruits & (~flags);
-        }
-    }
 }
diff --git a/src/Migrator/Framework/ColumnPropertyExtensions.cs b/src/Migrator/Framework/ColumnPropertyExtensions.cs
@@ -0,0 +1,26 @@
+using Migrator.Framework;
+
+namespace DotNetProjects.Migrator.Framework;
+
+public static class ColumnPropertyExtensions
+{
+    public static bool IsSet(this ColumnProperty columnProperty, ColumnProperty flags)
+    {
+        return (columnProperty & flags) == flags;
+    }
+
+    public static bool IsNotSet(this ColumnProperty columnProperty, ColumnProperty flags)
+    {
+        return (columnProperty & (~flags)) == 0;
+    }
+
+    public static ColumnProperty Set(this ColumnProperty columnProperty, ColumnProperty flags)
+    {
+        return columnProperty | flags;
+    }
+
+    public static ColumnProperty Clear(this ColumnProperty columnProperty, ColumnProperty flags)
+    {
+        return columnProperty & (~flags);
+    }
+}
diff --git a/src/Migrator/Providers/ColumnPropertiesMapper.cs b/src/Migrator/Providers/ColumnPropertiesMapper.cs
@@ -162,7 +162,7 @@ protected virtual void AddDefaultValue(Column column, List<string> vals)
         protected virtual void AddForeignKey(Column column, List<string> vals)
         {
             // TODO Does that really make sense?
-            AddValueIfSelected(column, ColumnProperty.ForeignKey, vals);
+            // AddValueIfSelected(column, ColumnProperty.ForeignKey, vals);
         }
 
         protected virtual void AddUnique(Column column, List<string> vals)
diff --git a/src/Migrator/Providers/Dialect.cs b/src/Migrator/Providers/Dialect.cs
@@ -10,10 +10,10 @@ namespace Migrator.Providers
     /// </summary>
     public abstract class Dialect : IDialect
     {
-        readonly Dictionary<ColumnProperty, string> propertyMap = new Dictionary<ColumnProperty, string>();
-        readonly HashSet<string> reservedWords = new HashSet<string>();
-        readonly TypeNames typeNames = new TypeNames();
-        readonly List<DbType> unsignedCompatibleTypes = new List<DbType>();
+        readonly Dictionary<ColumnProperty, string> propertyMap = [];
+        readonly HashSet<string> reservedWords = [];
+        readonly TypeNames typeNames = new();
+        readonly List<DbType> unsignedCompatibleTypes = [];
 
         protected Dialect()
         {
diff --git a/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs b/src/Migrator/Providers/Impl/PostgreSQL/PostgreSQLTransformationProvider.cs
@@ -11,6 +11,7 @@
 
 #endregion
 
+using DotNetProjects.Migrator.Framework;
 using Migrator.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs
diff --git a/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs b/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs
diff --git a/src/Migrator/Providers/TransformationProvider.cs b/src/Migrator/Providers/TransformationProvider.cs
