Adding support to primary key columns with serial type

lerocha · Feb 10, 2024 · b921f8c · b921f8c
1 parent b997dde
commit b921f8c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/ChinookDatabase/DataSources/ChinookDatabase.tt b/ChinookDatabase/DataSources/ChinookDatabase.tt
@@ -285,7 +285,7 @@ CREATE INDEX <#= ifkName #> ON <#= strategy.GetFullyQualifiedName(fromTableName)
             foreach (DataColumn col in table.Columns)
             {
                 string value = row[col.ColumnName].ToString();
-                if ((col.AutoIncrement && strategy.PrimaryKeyStrategy == PrimaryKeyStrategy.Identity) || value.Length==0) continue;
+                if ((col.AutoIncrement && strategy.PrimaryKeyStrategy != PrimaryKeyStrategy.None) || value.Length==0) continue;
 
                 if (col.DataType == typeof(DateTime))
                 {
@@ -453,8 +453,13 @@ public class OutputFile {
 
 private static string GetFileName(IDdlStrategy strategy, string extension)
 {
-	var suffix = (strategy.PrimaryKeyStrategy == PrimaryKeyStrategy.Identity ? "_AutoIncrementPKs" : string.Empty);
-	return string.Format("Chinook_{0}{1}.{2}", strategy.Name, suffix, extension);
+	var suffix = strategy.PrimaryKeyStrategy switch {
+		PrimaryKeyStrategy.Identity => "_AutoIncrementPKs",
+		PrimaryKeyStrategy.Serial => "_SerialPKs",
+		_ => string.Empty
+		};
+
+	return $"Chinook_{strategy.Name}{suffix}.{extension}";
 }
 
 private static string GetValues(IEnumerable<string> values, char delimiter)

diff --git a/ChinookDatabase/DdlStrategies/AbstractDdlStrategy.cs b/ChinookDatabase/DdlStrategies/AbstractDdlStrategy.cs
@@ -88,12 +88,13 @@ public virtual string GetColumns(IEnumerable<String> keys, char delimiter)
 
         public virtual string WriteCreateColumn(DataColumn column)
         {
-            var notnull = (column.AllowDBNull ? "" : "NOT NULL");
             var isPrimaryKey = column.Table?.PrimaryKey.Length == 1 && column.Table?.PrimaryKey.Contains(column) == true;
+            var type = isPrimaryKey && (PrimaryKeyStrategy == PrimaryKeyStrategy.Serial) ? "SERIAL" : GetStoreType(column);
+            var notnull = (column.AllowDBNull ? "" : "NOT NULL");
             var identity = (PrimaryKeyStrategy == PrimaryKeyStrategy.Identity) && isPrimaryKey ? Identity : String.Empty;
             return string.Format("{0} {1} {2} {3}",
                                  FormatName(column.ColumnName),
-                                 GetStoreType(column),
+                                 type,
                                  notnull, identity).Trim();
         }
 

diff --git a/ChinookDatabase/_T4Templates/Chinook.ttinclude b/ChinookDatabase/_T4Templates/Chinook.ttinclude
@@ -6338,12 +6338,13 @@
 
         public virtual string WriteCreateColumn(DataColumn column)
         {
-            var notnull = (column.AllowDBNull ? "" : "NOT NULL");
             var isPrimaryKey = column.Table?.PrimaryKey.Length == 1 && column.Table?.PrimaryKey.Contains(column) == true;
+            var type = isPrimaryKey && (PrimaryKeyStrategy == PrimaryKeyStrategy.Serial) ? "SERIAL" : GetStoreType(column);
+            var notnull = (column.AllowDBNull ? "" : "NOT NULL");
             var identity = (PrimaryKeyStrategy == PrimaryKeyStrategy.Identity) && isPrimaryKey ? Identity : String.Empty;
             return string.Format("{0} {1} {2} {3}",
                                  FormatName(column.ColumnName),
-                                 GetStoreType(column),
+                                 type,
                                  notnull, identity).Trim();
         }