Override Type

Author: Jacob Atanasio

lib/migration_generator/migration_generator.ex

@@ -792,18 +792,12 @@ defmodule AshPostgres.MigrationGenerator do
         snapshots
         |> Enum.count(& &1.has_create_action)
 
-      identity_column_defaults =
-        snapshots
-        |> Enum.flat_map(&Map.get(&1, :identity_column_defaults, []))
-        |> Enum.uniq()
-
       new_snapshot = %{
         snapshot
         | attributes: merge_attributes(attributes, snapshot.table, count_with_create),
           identities: snapshots |> Enum.flat_map(& &1.identities) |> Enum.uniq(),
           custom_indexes: snapshots |> Enum.flat_map(& &1.custom_indexes) |> Enum.uniq(),
-          custom_statements: snapshots |> Enum.flat_map(& &1.custom_statements) |> Enum.uniq(),
-          identity_column_defaults: identity_column_defaults
+          custom_statements: snapshots |> Enum.flat_map(& &1.custom_statements) |> Enum.uniq()
       }
 
       all_identities =
@@ -939,13 +933,16 @@ defmodule AshPostgres.MigrationGenerator do
   end
 
   defp merge_types(types, name, table) do
-    types
-    |> Enum.uniq()
-    |> case do
-      [type] ->
-        type
+    types = Enum.uniq(types)
 
-      types ->
+    cond do
+      length(types) == 1 ->
+        hd(types)
+
+      :identity in types ->
+        :identity
+
+      true ->
         raise "Conflicting types for table `#{table}.#{name}`: #{inspect(types)}"
     end
   end
@@ -2621,15 +2618,13 @@ defmodule AshPostgres.MigrationGenerator do
             %Operation.AddAttribute{
               attribute: Map.delete(attribute, :references),
               schema: snapshot.schema,
-              table: snapshot.table,
-              identity_column_defaults: Map.get(snapshot, :identity_column_defaults, [])
+              table: snapshot.table
             },
             %Operation.AlterAttribute{
               old_attribute: Map.delete(attribute, :references),
               new_attribute: attribute,
               schema: snapshot.schema,
-              table: snapshot.table,
-              identity_column_defaults: Map.get(snapshot, :identity_column_defaults, [])
+              table: snapshot.table
             },
             %Operation.DropForeignKey{
               attribute: attribute,
@@ -2644,8 +2639,7 @@ defmodule AshPostgres.MigrationGenerator do
             %Operation.AddAttribute{
               attribute: attribute,
               table: snapshot.table,
-              schema: snapshot.schema,
-              identity_column_defaults: Map.get(snapshot, :identity_column_defaults, [])
+              schema: snapshot.schema
             }
           ]
         end
@@ -2704,8 +2698,7 @@ defmodule AshPostgres.MigrationGenerator do
                   new_attribute: new_attribute,
                   old_attribute: old_attribute,
                   schema: snapshot.schema,
-                  table: snapshot.table,
-                  identity_column_defaults: Map.get(snapshot, :identity_column_defaults, [])
+                  table: snapshot.table
                 }
               ]
             else
@@ -2714,8 +2707,7 @@ defmodule AshPostgres.MigrationGenerator do
                   new_attribute: new_attribute,
                   old_attribute: old_attribute,
                   schema: snapshot.schema,
-                  table: snapshot.table,
-                  identity_column_defaults: Map.get(snapshot, :identity_column_defaults, [])
+                  table: snapshot.table
                 }
               ]
             end ++
@@ -2743,8 +2735,7 @@ defmodule AshPostgres.MigrationGenerator do
               new_attribute: Map.delete(new_attribute, :references),
               old_attribute: Map.delete(old_attribute, :references),
               schema: snapshot.schema,
-              table: snapshot.table,
-              identity_column_defaults: Map.get(snapshot, :identity_column_defaults, [])
+              table: snapshot.table
             }
           ]
         end
@@ -3172,8 +3163,7 @@ defmodule AshPostgres.MigrationGenerator do
       multitenancy: multitenancy(resource),
       base_filter: AshPostgres.DataLayer.Info.base_filter_sql(resource),
       has_create_action: has_create_action?(resource),
-      create_table_options: AshPostgres.DataLayer.Info.create_table_options(resource),
-      identity_column_defaults: AshPostgres.DataLayer.Info.identity_column_defaults(resource)
+      create_table_options: AshPostgres.DataLayer.Info.create_table_options(resource)
     }
 
     hash =
@@ -3293,6 +3283,16 @@ defmodule AshPostgres.MigrationGenerator do
           type
         end
 
+      identity_column_defaults = AshPostgres.DataLayer.Info.identity_column_defaults(resource)
+      source = attribute.source || attribute.name
+
+      type =
+        if source in identity_column_defaults and attribute.generated? and type in [:bigint, :integer] do
+          :identity
+        else
+          type
+        end
+
       {type, size, precision, scale} =
         migration_type_to_type(type)