All SQLite and SQL Server Tests are green #72 -#75

Ja bist du narrisch · Ja bist du narrisch · commit 8360f7dae37f · 2025-07-30T20:38:27.000+02:00
diff --git a/src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs b/src/Migrator.Tests/Providers/Base/TransformationProviderBase.cs
@@ -236,11 +236,11 @@ public void RemoveColumnWithDefault()
     [Test]
     public void RemoveUnexistingColumn()
     {
-        var exception1 = Assert.Throws<Exception>(() => Provider.RemoveColumn("TestTwo", "abc"));
-        var exception2 = Assert.Throws<Exception>(() => Provider.RemoveColumn("abc", "abc"));
+        var exception1 = Assert.Throws<MigrationException>(() => Provider.RemoveColumn("TestTwo", "abc"));
+        var exception2 = Assert.Throws<MigrationException>(() => Provider.RemoveColumn("abc", "abc"));
 
-        Assert.That(exception1.Message, Is.EqualTo("Column does not exist"));
-        Assert.That(exception2.Message, Is.EqualTo("Table does not exist"));
+        Assert.That(exception1.Message, Is.EqualTo("The table 'TestTwo' does not have a column named 'abc'"));
+        Assert.That(exception2.Message, Is.EqualTo("The table 'abc' does not exist"));
     }
 
     /// <summary>
diff --git a/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs b/src/Migrator.Tests/Providers/SQLServer/Base/SQLServerTransformationProviderTestBase.cs
@@ -16,12 +16,13 @@ public abstract class SQLServerTransformationProviderTestBase : TransformationPr
     public void SetUp()
     {
         var configReader = new ConfigurationReader();
-        var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLiteConnectionConfigId)
+        var connectionString = configReader.GetDatabaseConnectionConfigById(DatabaseConnectionConfigIds.SQLServerConnectionConfigId)
             .ConnectionString;
 
+
         DbProviderFactories.RegisterFactory("Microsoft.Data.SqlClient", () => Microsoft.Data.SqlClient.SqlClientFactory.Instance);
 
-        Provider = new SqlServerTransformationProvider(new SqlServerDialect(), connectionString, null, "default", null);
+        Provider = new SqlServerTransformationProvider(new SqlServerDialect(), connectionString, "dbo", "default", "Microsoft.Data.SqlClient");
         Provider.BeginTransaction();
 
         AddDefaultTable();
diff --git a/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs b/src/Migrator.Tests/Providers/SQLite/SQLiteTransformationProviderGenericTests.cs
@@ -1,6 +1,7 @@
 using DotNetProjects.Migrator.Providers.Impl.SQLite;
 using Migrator.Providers.SQLite;
 using Migrator.Tests.Settings;
+using Migrator.Tests.Settings.Config;
 using NUnit.Framework;
 
 namespace Migrator.Tests.Providers.SQLite.Base;
@@ -13,7 +14,7 @@ public class SQLiteTransformationProviderGenericTests : TransformationProviderBa
     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/Providers/Impl/SQLite/SQLiteTransformationProvider.cs b/src/Migrator/Providers/Impl/SQLite/SQLiteTransformationProvider.cs
@@ -396,19 +396,19 @@ public override void RemoveColumn(string tableName, string column)
 
             if (!TableExists(tableName))
             {
-                throw new Exception("Table does not exist");
+                throw new MigrationException($"The table '{tableName}' does not exist");
             }
 
             if (!ColumnExists(tableName, column))
             {
-                throw new Exception("Column does not exist");
+                throw new MigrationException($"The table '{tableName}' does not have a column named '{column}'");
             }
 
             var sqliteInfoMainTable = GetSQLiteTableInfo(tableName);
 
             if (!sqliteInfoMainTable.ColumnMappings.Any(x => x.OldName == column))
             {
-                throw new Exception("Column not found");
+                throw new MigrationException("Column not found");
             }
 
             // We throw if all of the conditions are fulfilled:
diff --git a/src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs b/src/Migrator/Providers/Impl/SqlServer/SqlServerDialect.cs
@@ -45,7 +45,7 @@ public SqlServerDialect()
             RegisterColumnType(DbType.StringFixedLength, int.MaxValue - 1, "NCHAR($l)");
             RegisterColumnType(DbType.StringFixedLength, int.MaxValue, "NCHAR(max)");
             RegisterColumnType(DbType.String, "NVARCHAR(255)");
-            RegisterColumnType(DbType.String, int.MaxValue - 1, "NVARCHAR($l)");
+            RegisterColumnType(DbType.String, 4000, "NVARCHAR($l)");
             RegisterColumnType(DbType.String, int.MaxValue, "NVARCHAR(max)");
             //RegisterColumnType(DbType.String, 1073741823, "NTEXT");
             RegisterColumnType(DbType.Time, "DATETIME");
diff --git a/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs b/src/Migrator/Providers/Impl/SqlServer/SqlServerTransformationProvider.cs
@@ -90,13 +90,15 @@ public override void AddColumn(string table, string sqlColumn)
             table = _dialect.TableNameNeedsQuote ? _dialect.Quote(table) : table;
             ExecuteNonQuery(string.Format("ALTER TABLE {0} ADD {1}", table, sqlColumn));
         }
+
         public override void AddPrimaryKeyNonClustered(string name, string table, params string[] columns)
         {
-            string nonclusteredString = "NONCLUSTERED";
+            var nonclusteredString = "NONCLUSTERED";
             ExecuteNonQuery(
-            String.Format("ALTER TABLE {0} ADD CONSTRAINT {1} PRIMARY KEY {2} ({3}) ", table, name, nonclusteredString,
-                          String.Join(",", QuoteColumnNamesIfRequired(columns))));
+            string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} PRIMARY KEY {2} ({3}) ", table, name, nonclusteredString,
+                          string.Join(",", QuoteColumnNamesIfRequired(columns))));
         }
+
         public override void AddIndex(string table, Index index)
         {
             var name = QuoteConstraintNameIfRequired(index.Name);
@@ -108,7 +110,7 @@ public override void AddIndex(string table, Index index)
             if (index.IncludeColumns != null && index.IncludeColumns.Length > 0)
             {
                 var include = QuoteColumnNamesIfRequired(index.IncludeColumns);
-                ExecuteNonQuery(String.Format("CREATE {0}{1} INDEX {2} ON {3} ({4}) INCLUDE ({5})", (index.Unique ? "UNIQUE " : ""), (index.Clustered ? "CLUSTERED" : "NONCLUSTERED"), name, table, string.Join(", ", columns), string.Join(", ", include)));
+                ExecuteNonQuery(string.Format("CREATE {0}{1} INDEX {2} ON {3} ({4}) INCLUDE ({5})", (index.Unique ? "UNIQUE " : ""), (index.Clustered ? "CLUSTERED" : "NONCLUSTERED"), name, table, string.Join(", ", columns), string.Join(", ", include)));
             }
             else
             {
@@ -132,7 +134,7 @@ public override void ChangeColumn(string table, Column column)
 
                 base.ChangeColumn(table, column);
 
-                ColumnPropertiesMapper mapper = _dialect.GetAndMapColumnPropertiesWithoutDefault(column);
+                var mapper = _dialect.GetAndMapColumnPropertiesWithoutDefault(column);
                 ExecuteNonQuery(string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} {2} FOR {3}", this.QuoteTableNameIfRequired(table), "DF_" + table + "_" + column.Name, _dialect.Default(def), this.QuoteColumnNameIfRequired(column.Name)));
 
                 if (notNull)
@@ -147,11 +149,14 @@ public override void ChangeColumn(string table, Column column)
         public override bool ColumnExists(string table, string column)
         {
             string schema;
+
             if (!TableExists(table))
             {
                 return false;
             }
+
             int firstIndex = table.IndexOf(".");
+
             if (firstIndex >= 0)
             {
                 schema = table.Substring(0, firstIndex);
@@ -161,6 +166,7 @@ public override bool ColumnExists(string table, string column)
             {
                 schema = _defaultSchema;
             }
+
             using (var cmd = CreateCommand())
             using (
                 IDataReader reader = base.ExecuteQuery(cmd, string.Format("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{0}' AND TABLE_NAME='{1}' AND COLUMN_NAME='{2}'", schema, table, column)))
@@ -185,14 +191,17 @@ public override bool TableExists(string table)
             int firstIndex = table.IndexOf(".");
             if (firstIndex >= 0)
             {
-                schema = table.Substring(0, firstIndex);
-                table = table.Substring(firstIndex + 1);
+                schema = table.Substring(0, firstIndex).Trim();
+                table = table.Substring(firstIndex + 1).Trim();
             }
             else
             {
                 schema = _defaultSchema;
             }
 
+            schema = schema.StartsWith("[") && schema.EndsWith("]") ? schema.Substring(1, schema.Length - 2) : schema;
+            table = table.StartsWith("[") && table.EndsWith("]") ? table.Substring(1, table.Length - 2) : table;
+
             using (var cmd = CreateCommand())
             using (IDataReader reader = base.ExecuteQuery(cmd, string.Format("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='{0}' AND TABLE_SCHEMA='{1}'", table, schema)))
             {
@@ -453,6 +462,11 @@ public override void RemoveColumn(string table, string column)
 
         public override void RenameColumn(string tableName, string oldColumnName, string newColumnName)
         {
+            if (!TableExists(tableName))
+            {
+                throw new MigrationException($"The table '{tableName}' does not exist");
+            }
+
             if (ColumnExists(tableName, newColumnName))
                 throw new MigrationException(String.Format("Table '{0}' has column named '{1}' already", tableName, newColumnName));
 
diff --git a/src/Migrator/Providers/TransformationProvider.cs b/src/Migrator/Providers/TransformationProvider.cs
@@ -443,16 +443,21 @@ public virtual void RenameColumn(string tableName, string oldColumnName, string
             ExecuteNonQuery(String.Format("ALTER TABLE {0} RENAME COLUMN {1} TO {2}", tableName, Dialect.Quote(column.Name), quotedNewColumnName));
         }
 
-        public virtual void RemoveColumn(string table, string column)
+        public virtual void RemoveColumn(string tableName, string column)
         {
-            if (!ColumnExists(table, column, true))
+            if (!TableExists(tableName))
             {
-                throw new MigrationException(string.Format("The table '{0}' does not have a column named '{1}'", table, column));
+                throw new MigrationException($"The table '{tableName}' does not exist");
             }
 
-            var existingColumn = GetColumnByName(table, column);
+            if (!ColumnExists(tableName, column, true))
+            {
+                throw new MigrationException(string.Format("The table '{0}' does not have a column named '{1}'", tableName, column));
+            }
+
+            var existingColumn = GetColumnByName(tableName, column);
 
-            ExecuteNonQuery(String.Format("ALTER TABLE {0} DROP COLUMN {1} ", table, Dialect.Quote(existingColumn.Name)));
+            ExecuteNonQuery(String.Format("ALTER TABLE {0} DROP COLUMN {1} ", tableName, Dialect.Quote(existingColumn.Name)));
         }
 
         public virtual bool ColumnExists(string table, string column)

Original file line number	Diff line number	Diff line change
`@@ -236,11 +236,11 @@ public void RemoveColumnWithDefault()`
`236`	`236`	`[Test]`
`237`	`237`	`public void RemoveUnexistingColumn()`
`238`	`238`	`{`
`239`		`- var exception1 = Assert.Throws<Exception>(() => Provider.RemoveColumn("TestTwo", "abc"));`
`240`		`- var exception2 = Assert.Throws<Exception>(() => Provider.RemoveColumn("abc", "abc"));`
	`239`	`+ var exception1 = Assert.Throws<MigrationException>(() => Provider.RemoveColumn("TestTwo", "abc"));`
	`240`	`+ var exception2 = Assert.Throws<MigrationException>(() => Provider.RemoveColumn("abc", "abc"));`
`241`	`241`
`242`		`- Assert.That(exception1.Message, Is.EqualTo("Column does not exist"));`
`243`		`- Assert.That(exception2.Message, Is.EqualTo("Table does not exist"));`
	`242`	`+ Assert.That(exception1.Message, Is.EqualTo("The table 'TestTwo' does not have a column named 'abc'"));`
	`243`	`+ Assert.That(exception2.Message, Is.EqualTo("The table 'abc' does not exist"));`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -396,19 +396,19 @@ public override void RemoveColumn(string tableName, string column)`
`396`	`396`
`397`	`397`	`if (!TableExists(tableName))`
`398`	`398`	`{`
`399`		`- throw new Exception("Table does not exist");`
	`399`	`+ throw new MigrationException($"The table '{tableName}' does not exist");`
`400`	`400`	`}`
`401`	`401`
`402`	`402`	`if (!ColumnExists(tableName, column))`
`403`	`403`	`{`
`404`		`- throw new Exception("Column does not exist");`
	`404`	`+ throw new MigrationException($"The table '{tableName}' does not have a column named '{column}'");`
`405`	`405`	`}`
`406`	`406`
`407`	`407`	`var sqliteInfoMainTable = GetSQLiteTableInfo(tableName);`
`408`	`408`
`409`	`409`	`if (!sqliteInfoMainTable.ColumnMappings.Any(x => x.OldName == column))`
`410`	`410`	`{`
`411`		`- throw new Exception("Column not found");`
	`411`	`+ throw new MigrationException("Column not found");`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`// We throw if all of the conditions are fulfilled:`
Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,15 @@ public override void AddColumn(string table, string sqlColumn)`
`90`	`90`	`table = _dialect.TableNameNeedsQuote ? _dialect.Quote(table) : table;`
`91`	`91`	`ExecuteNonQuery(string.Format("ALTER TABLE {0} ADD {1}", table, sqlColumn));`
`92`	`92`	`}`
	`93`	`+`
`93`	`94`	`public override void AddPrimaryKeyNonClustered(string name, string table, params string[] columns)`
`94`	`95`	`{`
`95`		`- string nonclusteredString = "NONCLUSTERED";`
	`96`	`+ var nonclusteredString = "NONCLUSTERED";`
`96`	`97`	`ExecuteNonQuery(`
`97`		`- String.Format("ALTER TABLE {0} ADD CONSTRAINT {1} PRIMARY KEY {2} ({3}) ", table, name, nonclusteredString,`
`98`		`- String.Join(",", QuoteColumnNamesIfRequired(columns))));`
	`98`	`+ string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} PRIMARY KEY {2} ({3}) ", table, name, nonclusteredString,`
	`99`	`+ string.Join(",", QuoteColumnNamesIfRequired(columns))));`
`99`	`100`	`}`
	`101`	`+`
`100`	`102`	`public override void AddIndex(string table, Index index)`
`101`	`103`	`{`
`102`	`104`	`var name = QuoteConstraintNameIfRequired(index.Name);`
`@@ -108,7 +110,7 @@ public override void AddIndex(string table, Index index)`
`108`	`110`	`if (index.IncludeColumns != null && index.IncludeColumns.Length > 0)`
`109`	`111`	`{`
`110`	`112`	`var include = QuoteColumnNamesIfRequired(index.IncludeColumns);`
`111`		`- ExecuteNonQuery(String.Format("CREATE {0}{1} INDEX {2} ON {3} ({4}) INCLUDE ({5})", (index.Unique ? "UNIQUE " : ""), (index.Clustered ? "CLUSTERED" : "NONCLUSTERED"), name, table, string.Join(", ", columns), string.Join(", ", include)));`
	`113`	`+ ExecuteNonQuery(string.Format("CREATE {0}{1} INDEX {2} ON {3} ({4}) INCLUDE ({5})", (index.Unique ? "UNIQUE " : ""), (index.Clustered ? "CLUSTERED" : "NONCLUSTERED"), name, table, string.Join(", ", columns), string.Join(", ", include)));`
`112`	`114`	`}`
`113`	`115`	`else`
`114`	`116`	`{`
`@@ -132,7 +134,7 @@ public override void ChangeColumn(string table, Column column)`
`132`	`134`
`133`	`135`	`base.ChangeColumn(table, column);`
`134`	`136`
`135`		`- ColumnPropertiesMapper mapper = _dialect.GetAndMapColumnPropertiesWithoutDefault(column);`
	`137`	`+ var mapper = _dialect.GetAndMapColumnPropertiesWithoutDefault(column);`
`136`	`138`	`ExecuteNonQuery(string.Format("ALTER TABLE {0} ADD CONSTRAINT {1} {2} FOR {3}", this.QuoteTableNameIfRequired(table), "DF_" + table + "_" + column.Name, _dialect.Default(def), this.QuoteColumnNameIfRequired(column.Name)));`
`137`	`139`
`138`	`140`	`if (notNull)`
`@@ -147,11 +149,14 @@ public override void ChangeColumn(string table, Column column)`
`147`	`149`	`public override bool ColumnExists(string table, string column)`
`148`	`150`	`{`
`149`	`151`	`string schema;`
	`152`	`+`
`150`	`153`	`if (!TableExists(table))`
`151`	`154`	`{`
`152`	`155`	`return false;`
`153`	`156`	`}`
	`157`	`+`
`154`	`158`	`int firstIndex = table.IndexOf(".");`
	`159`	`+`
`155`	`160`	`if (firstIndex >= 0)`
`156`	`161`	`{`
`157`	`162`	`schema = table.Substring(0, firstIndex);`
`@@ -161,6 +166,7 @@ public override bool ColumnExists(string table, string column)`
`161`	`166`	`{`
`162`	`167`	`schema = _defaultSchema;`
`163`	`168`	`}`
	`169`	`+`
`164`	`170`	`using (var cmd = CreateCommand())`
`165`	`171`	`using (`
`166`	`172`	`IDataReader reader = base.ExecuteQuery(cmd, string.Format("SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '{0}' AND TABLE_NAME='{1}' AND COLUMN_NAME='{2}'", schema, table, column)))`
`@@ -185,14 +191,17 @@ public override bool TableExists(string table)`
`185`	`191`	`int firstIndex = table.IndexOf(".");`
`186`	`192`	`if (firstIndex >= 0)`
`187`	`193`	`{`
`188`		`- schema = table.Substring(0, firstIndex);`
`189`		`- table = table.Substring(firstIndex + 1);`
	`194`	`+ schema = table.Substring(0, firstIndex).Trim();`
	`195`	`+ table = table.Substring(firstIndex + 1).Trim();`
`190`	`196`	`}`
`191`	`197`	`else`
`192`	`198`	`{`
`193`	`199`	`schema = _defaultSchema;`
`194`	`200`	`}`
`195`	`201`
	`202`	`+ schema = schema.StartsWith("[") && schema.EndsWith("]") ? schema.Substring(1, schema.Length - 2) : schema;`
	`203`	`+ table = table.StartsWith("[") && table.EndsWith("]") ? table.Substring(1, table.Length - 2) : table;`
	`204`	`+`
`196`	`205`	`using (var cmd = CreateCommand())`
`197`	`206`	`using (IDataReader reader = base.ExecuteQuery(cmd, string.Format("SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='{0}' AND TABLE_SCHEMA='{1}'", table, schema)))`
`198`	`207`	`{`
`@@ -453,6 +462,11 @@ public override void RemoveColumn(string table, string column)`
`453`	`462`
`454`	`463`	`public override void RenameColumn(string tableName, string oldColumnName, string newColumnName)`
`455`	`464`	`{`
	`465`	`+ if (!TableExists(tableName))`
	`466`	`+ {`
	`467`	`+ throw new MigrationException($"The table '{tableName}' does not exist");`
	`468`	`+ }`
	`469`	`+`
`456`	`470`	`if (ColumnExists(tableName, newColumnName))`
`457`	`471`	`throw new MigrationException(String.Format("Table '{0}' has column named '{1}' already", tableName, newColumnName));`
`458`	`472`
Original file line number	Diff line number	Diff line change
`@@ -443,16 +443,21 @@ public virtual void RenameColumn(string tableName, string oldColumnName, string`
`443`	`443`	`ExecuteNonQuery(String.Format("ALTER TABLE {0} RENAME COLUMN {1} TO {2}", tableName, Dialect.Quote(column.Name), quotedNewColumnName));`
`444`	`444`	`}`
`445`	`445`
`446`		`- public virtual void RemoveColumn(string table, string column)`
	`446`	`+ public virtual void RemoveColumn(string tableName, string column)`
`447`	`447`	`{`
`448`		`- if (!ColumnExists(table, column, true))`
	`448`	`+ if (!TableExists(tableName))`
`449`	`449`	`{`
`450`		`- throw new MigrationException(string.Format("The table '{0}' does not have a column named '{1}'", table, column));`
	`450`	`+ throw new MigrationException($"The table '{tableName}' does not exist");`
`451`	`451`	`}`
`452`	`452`
`453`		`- var existingColumn = GetColumnByName(table, column);`
	`453`	`+ if (!ColumnExists(tableName, column, true))`
	`454`	`+ {`
	`455`	`+ throw new MigrationException(string.Format("The table '{0}' does not have a column named '{1}'", tableName, column));`
	`456`	`+ }`
	`457`	`+`
	`458`	`+ var existingColumn = GetColumnByName(tableName, column);`
`454`	`459`
`455`		`- ExecuteNonQuery(String.Format("ALTER TABLE {0} DROP COLUMN {1} ", table, Dialect.Quote(existingColumn.Name)));`
	`460`	`+ ExecuteNonQuery(String.Format("ALTER TABLE {0} DROP COLUMN {1} ", tableName, Dialect.Quote(existingColumn.Name)));`
`456`	`461`	`}`
`457`	`462`
`458`	`463`	`public virtual bool ColumnExists(string table, string column)`