improvement: location in spark errors and migration generator fixes

Author: zachdaniel

lib/custom_index.ex

@@ -13,11 +13,10 @@ defmodule AshPostgres.CustomIndex do
     :include,
     :nulls_distinct,
     :message,
-    :all_tenants?,
-    :__spark_metadata__
+    :all_tenants?
   ]
 
-  defstruct @fields
+  defstruct @fields ++ [:__spark_metadata__]
 
   def fields, do: @fields
 

lib/migration_generator/migration_generator.ex

@@ -3044,6 +3044,7 @@ defmodule AshPostgres.MigrationGenerator do
               identity_index_names[identity.name] ||
                 "#{relationship.context[:data_layer][:table]}_#{identity.name}_index"
             )
+            |> Map.delete(:__spark_metadata__)
           end)
         end)
         |> Map.update!(:attributes, fn attributes ->
@@ -3057,7 +3058,9 @@ defmodule AshPostgres.MigrationGenerator do
               source_attribute =
                 Ash.Resource.Info.attribute(relationship.source, relationship.source_attribute)
 
-              Map.put(attribute, :references, %{
+              attribute
+              |> Map.delete(:__spark_metadata__)
+              |> Map.put(:references, %{
                 destination_attribute: source_attribute.source,
                 destination_attribute_default:
                   default(
@@ -3489,7 +3492,8 @@ defmodule AshPostgres.MigrationGenerator do
 
   @uuid_functions [&Ash.UUID.generate/0, &Ecto.UUID.generate/0]
 
-  defp default(%{name: name, default: default, type: type}, resource, _repo) when is_function(default) do
+  defp default(%{name: name, default: default, type: type}, resource, _repo)
+       when is_function(default) do
     configured_default(resource, name) ||
       cond do
         default in @uuid_functions ->

lib/statement.ex

@@ -5,11 +5,10 @@ defmodule AshPostgres.Statement do
     :name,
     :up,
     :down,
-    :code?,
-    :__spark_metadata__
+    :code?
   ]
 
-  defstruct @fields
+  defstruct @fields ++ [:__spark_metadata__]
 
   def fields, do: @fields
 

lib/verifiers/ensure_table_or_polymorphic.ex

@@ -24,7 +24,8 @@ defmodule AshPostgres.Verifiers.EnsureTableOrPolymorphic do
         end
         ```
         """,
-        path: [:postgres, :table]
+        path: [:postgres, :table],
+        location: Spark.Dsl.Transformer.get_section_anno(dsl, [:postgres])
     end
   end
 end

lib/verifiers/prevent_attribute_multitenancy_and_non_full_match_type.ex

@@ -23,7 +23,8 @@ defmodule AshPostgres.Verifiers.PreventAttributeMultitenancyAndNonFullMatchType
 
             The reference #{inspect(resource)}.#{reference.relationship} can't have `match_type: :#{reference.match_type}` because it's referencing another multitenant resource with attribute strategy using a non-primary key index, which requires using `match_type: :full`.
             """,
-            path: [:postgres, :references, reference.relationship]
+            path: [:postgres, :references, reference.relationship],
+            location: Spark.Dsl.Transformer.get_section_anno(dsl, [:postgres, :references])
         else
           :ok
         end

lib/verifiers/prevent_multidimensional_array_aggregates.ex

@@ -35,7 +35,8 @@ defmodule AshPostgres.Verifiers.PreventMultidimensionalArrayAggregates do
 
             Postgres does not support multidimensional arrays with differing lengths internally. In the future we may be able to remove this restriction
             for the `:first` type aggregate, but likely never for `:list`. In the meantime, you will have to use a custom calculation to get this data.
-            """
+            """,
+            location: Ash.Resource.Info.aggregate(resource, aggregate.name) |> Spark.Dsl.Entity.anno()
 
         _ ->
           :ok

lib/verifiers/validate_identity_index_names.ex

@@ -14,7 +14,8 @@ defmodule AshPostgres.Verifiers.ValidateIdentityIndexNames do
           module: Verifier.get_persisted(dsl, :module),
           message: """
           Identity #{identity} has a name that is too long. Names must be 63 characters or less.
-          """
+          """,
+          location: Spark.Dsl.Transformer.get_opt_anno(dsl, [:postgres, :identity_index_names], identity)
       end
     end)
 
@@ -36,7 +37,8 @@ defmodule AshPostgres.Verifiers.ValidateIdentityIndexNames do
             Multiple identities would result in the same index name: #{name}
 
             Identities: #{inspect(Enum.map(identities, & &1.name))}
-            """
+            """,
+            location: Spark.Dsl.Transformer.get_section_anno(dsl, [:postgres, :identity_index_names])
 
         {name, [identity]} ->
           if String.length(name) > 63 do
@@ -51,7 +53,8 @@ defmodule AshPostgres.Verifiers.ValidateIdentityIndexNames do
               postgres do
                 identity_index_names #{identity.name}: "a_shorter_name"
               end
-              """
+              """,
+              location: Spark.Dsl.Entity.anno(identity)
           end
       end)
     end

lib/verifiers/validate_references.ex

@@ -12,7 +12,8 @@ defmodule AshPostgres.Verifiers.ValidateReferences do
           path: [:postgres, :references, reference.relationship],
           module: Verifier.get_persisted(dsl, :module),
           message:
-            "Found reference configuration for relationship `#{reference.relationship}`, but no such relationship exists"
+            "Found reference configuration for relationship `#{reference.relationship}`, but no such relationship exists",
+          location: Spark.Dsl.Transformer.get_section_anno(dsl, [:postgres, :references])
       end
     end)