add collate to CreateTableColumn

sqlkata · AlirezaEiji191379 · Jun 27, 2023 · Jun 27, 2023 · Jun 27, 2023 · Jun 27, 2023
commit dd7cbd313263cab2dffc4777413aaa4cb994ee29
diff --git a/Program/Program.cs b/Program/Program.cs
@@ -22,7 +22,7 @@ static void Main(string[] args)
             var compilerProvider = provider.GetRequiredService<ICompilerProvider>();
             var compiler = compilerProvider.CreateCompiler(DataSource.Oracle);
 
-            var query = new Query("Users").CreateTable(new List<TableColumnDefenitionDto>()
+            var query = new Query("Users").CreateTable(new List<TableColumnDefinitionDto>()
             {
                 new()
                 {

diff --git a/QueryBuilder/Clauses/ColumnClause.cs b/QueryBuilder/Clauses/ColumnClause.cs
@@ -41,6 +41,7 @@ public class CreateTableColumn : AbstractClause
         public bool IsUnique { get; set; }
         public bool IsIdentity { get; set; }
         public bool IsAutoIncrement { get; set; }
+        public string Collate { get; set; }
         public override AbstractClause Clone()
         {
             return new CreateTableColumn
@@ -53,6 +54,7 @@ public override AbstractClause Clone()
                 IsUnique= IsUnique,
                 IsIdentity= IsIdentity,
                 IsNullable= IsNullable,
+                Collate = Collate
             };
         }
     }
@@ -114,7 +116,7 @@ public override AbstractClause Clone()
     public class AggregatedColumn : AbstractColumn
     {
         /// <summary>
-        /// Gets or sets the a query that used to filter the data, 
+        /// Gets or sets the a query that used to filter the data,
         /// the compiler will consider only the `Where` clause.
         /// </summary>
         /// <value>

diff --git a/QueryBuilder/Compilers/DDLCompiler/CreateTableBuilders/ColumnCompilers/ColumnCompiler.cs b/QueryBuilder/Compilers/DDLCompiler/CreateTableBuilders/ColumnCompilers/ColumnCompiler.cs
@@ -22,15 +22,16 @@ public string CompileCreateTableColumns(List<CreateTableColumn> createTableColum
             {
                 throw new AutoIncrementOrIdentityExceededException("table can not have more than one auto increment or identity column");
             }
-            foreach (var columnCluase in createTableColumnClauses)
+            foreach (var columnClause in createTableColumnClauses)
             {
-                var nullOrNot = columnCluase.IsNullable ? "NULL " : "NOT NULL ";
-                if (columnCluase.IsIdentity || columnCluase.IsAutoIncrement)
+                var nullOrNot = columnClause.IsNullable ? "NULL " : "NOT NULL ";
+                var collate = columnClause.Collate == null ? "" : $"Collate {columnClause.Collate}";
+                if (columnClause.IsIdentity || columnClause.IsAutoIncrement)
                 {
-                    queryString.Append($"{columnCluase.ColumnName} {columnCluase.ColumnDbType.GetDBType()}  {_sqlCommandUtil.AutoIncrementIdentityCommandGenerator()},\n");
+                    queryString.Append($"{columnClause.ColumnName} {columnClause.ColumnDbType.GetDBType()} {collate} {_sqlCommandUtil.AutoIncrementIdentityCommandGenerator()},\n");
                     continue;
                 }
-                queryString.Append($"{columnCluase.ColumnName} {columnCluase.ColumnDbType.GetDBType()} {nullOrNot},\n");
+                queryString.Append($"{columnClause.ColumnName} {columnClause.ColumnDbType.GetDBType()} {collate} {nullOrNot},\n");
             }
 
             return queryString.ToString();

diff --git a/...t/CreateTable/TableColumnDefenitionDto.cs → ...t/CreateTable/TableColumnDefinitionDto.cs b/...t/CreateTable/TableColumnDefenitionDto.cs → ...t/CreateTable/TableColumnDefinitionDto.cs
@@ -2,7 +2,7 @@
 
 namespace SqlKata.Contract.CreateTable
 {
-    public class TableColumnDefenitionDto
+    public class TableColumnDefinitionDto
     {
         public string ColumnName { get; set; }
         public BaseDBColumn ColumnDbType { get; set; }
@@ -11,5 +11,6 @@ public class TableColumnDefenitionDto
         public bool IsUnique { get; set; }
         public bool IsIdentity { get; set; }
         public bool IsAutoIncrement { get; set; }
+        public string Collate { get; set; }
     }
 }
diff --git a/QueryBuilder/Query.CreateTable.cs b/QueryBuilder/Query.CreateTable.cs
@@ -8,7 +8,7 @@ namespace SqlKata
 {
     public partial class Query
     {
-        public Query CreateTable(IEnumerable<TableColumnDefenitionDto> columns,TableType tableType = TableType.Permanent,CreateDbTableExtension createDbTableExtension = null)
+        public Query CreateTable(IEnumerable<TableColumnDefinitionDto> columns,TableType tableType = TableType.Permanent,CreateDbTableExtension createDbTableExtension = null)
         {
             Method = "CreateTable";
 
@@ -29,7 +29,8 @@ public Query CreateTable(IEnumerable<TableColumnDefenitionDto> columns,TableType
                     IsUnique = column.IsUnique,
                     IsPrimaryKey = column.IsPrimaryKey,
                     IsAutoIncrement = column.IsAutoIncrement,
-                    IsIdentity = column.IsIdentity
+                    IsIdentity = column.IsIdentity,
+                    Collate = column.Collate
                 });
             });