Support for collation on columns (part of #1050).

Author: cincuranet

src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/Migrations/MigrationsTests.cs

@@ -95,6 +95,15 @@ public async Task CreateTable()
 							DefaultValueSql = "'x'",
 							IsNullable = true,
 						},
+						new AddColumnOperation
+						{
+							Name = "COLLA",
+							Table = "People",
+							ClrType = typeof(string),
+							MaxLength = 20,
+							IsNullable = true,
+							Collation = "UNICODE_CI_AI"
+						},
 				},
 			PrimaryKey = new AddPrimaryKeyOperation
 			{
@@ -125,6 +134,7 @@ public async Task CreateTable()
     ""SSN"" char(11),
     ""DEF_O"" VARCHAR(20) DEFAULT _UTF8'test',
     ""DEF_S"" VARCHAR(20) DEFAULT 'x',
+    ""COLLA"" VARCHAR(20) COLLATE UNICODE_CI_AI,
     PRIMARY KEY (""Id""),
     UNIQUE (""SSN""),
     FOREIGN KEY (""EmployerId"") REFERENCES ""Companies"" (""Id"") ON UPDATE NO ACTION ON DELETE NO ACTION
@@ -201,6 +211,15 @@ public async Task CreateTableScript()
 							DefaultValueSql = "'x'",
 							IsNullable = true,
 						},
+						new AddColumnOperation
+						{
+							Name = "COLLA",
+							Table = "People",
+							ClrType = typeof(string),
+							MaxLength = 20,
+							IsNullable = true,
+							Collation = "UNICODE_CI_AI"
+						},
 				},
 			PrimaryKey = new AddPrimaryKeyOperation
 			{
@@ -231,6 +250,7 @@ public async Task CreateTableScript()
     ""SSN"" char(11),
     ""DEF_O"" VARCHAR(20) DEFAULT _UTF8'test',
     ""DEF_S"" VARCHAR(20) DEFAULT 'x',
+    ""COLLA"" VARCHAR(20) COLLATE UNICODE_CI_AI,
     PRIMARY KEY (""Id""),
     UNIQUE (""SSN""),
     FOREIGN KEY (""EmployerId"") REFERENCES ""Companies"" (""Id"") ON UPDATE NO ACTION ON DELETE NO ACTION
@@ -272,6 +292,23 @@ public async Task AddColumn()
 		Assert.AreEqual(NewLineEnd(@"ALTER TABLE ""schema"".""People"" ADD ""NewColumn"" DECIMAL(18,2) NOT NULL;"), batch[0].CommandText);
 	}
 
+	[Test]
+	public async Task AddColumnWithCollation()
+	{
+		var operation = new AddColumnOperation()
+		{
+			Table = "People",
+			Name = "NewColumn",
+			ClrType = typeof(string),
+			MaxLength = 10,
+			IsNullable = false,
+			Collation = "UNICODE_CI_AI",
+		};
+		var batch = await Generate(new[] { operation });
+		Assert.AreEqual(1, batch.Count());
+		Assert.AreEqual(NewLineEnd(@"ALTER TABLE ""People"" ADD ""NewColumn"" VARCHAR(10) COLLATE UNICODE_CI_AI NOT NULL;"), batch[0].CommandText);
+	}
+
 	[Test]
 	public async Task DropColumn()
 	{
@@ -456,6 +493,29 @@ public async Task AlterColumnRemoveSequenceTrigger()
 		Assert.AreEqual(NewLineEnd(@"ALTER TABLE ""People"" ALTER COLUMN ""Col"" TYPE INTEGER;"), batch[2].CommandText);
 	}
 
+	[Test]
+	public async Task AlterColumnCollation()
+	{
+		var operation = new AlterColumnOperation()
+		{
+			Table = "People",
+			Name = "Col",
+			ClrType = typeof(string),
+			MaxLength = 10,
+			IsNullable = false,
+			Collation = "UNICODE_CI_AI",
+			OldColumn = new AddColumnOperation()
+			{
+				ClrType = typeof(string),
+				MaxLength = 10,
+				IsNullable = false,
+			},
+		};
+		var batch = await Generate(new[] { operation });
+		Assert.AreEqual(3, batch.Count());
+		Assert.AreEqual(NewLineEnd(@"ALTER TABLE ""People"" ALTER COLUMN ""Col"" TYPE VARCHAR(10) COLLATE UNICODE_CI_AI;"), batch[1].CommandText);
+	}
+
 	[Test]
 	public async Task RenameColumn()
 	{

src/FirebirdSql.EntityFrameworkCore.Firebird/Migrations/FbMigrationsSqlGenerator.cs

@@ -127,6 +127,11 @@ protected override void Generate(AlterColumnOperation operation, IModel model, M
 			var type = GetColumnType(operation.Schema, operation.Table, operation.Name, operation, model);
 			builder.Append(type);
 		}
+		if (operation.Collation != null)
+		{
+			builder.Append(" COLLATE ");
+			builder.Append(operation.Collation);
+		}
 		if (valueGenerationStrategy == FbValueGenerationStrategy.IdentityColumn)
 		{
 			builder.Append(" GENERATED BY DEFAULT AS IDENTITY");
@@ -323,9 +328,15 @@ public virtual void Generate(FbDropDatabaseOperation operation, IModel model, Mi
 
 	protected override void ColumnDefinition(string schema, string table, string name, ColumnOperation operation, IModel model, MigrationCommandListBuilder builder)
 	{
-		builder.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(name))
-			   .Append(" ")
-			   .Append(operation.ColumnType ?? GetColumnType(schema, table, name, operation, model));
+		builder.Append(Dependencies.SqlGenerationHelper.DelimitIdentifier(name));
+		builder.Append(" ");
+		builder.Append(operation.ColumnType ?? GetColumnType(schema, table, name, operation, model));
+
+		if (operation.Collation != null)
+		{
+			builder.Append(" COLLATE ");
+			builder.Append(operation.Collation);
+		}
 
 		var valueGenerationStrategy = operation[FbAnnotationNames.ValueGenerationStrategy] as FbValueGenerationStrategy?;
 		if (valueGenerationStrategy == FbValueGenerationStrategy.IdentityColumn)