fix: fixes for map types nested in expressions

requires latest ash_sql for build to pass

Author: zachdaniel

lib/sql_implementation.ex

@@ -23,16 +23,16 @@ defmodule AshPostgres.SqlImplementation do
         nil
 
       {:array, type} ->
-        parameterized_type({:array, Ash.Type.get_type(type)}, [], false)
+        parameterized_type({:array, Ash.Type.get_type(type)}, [])
 
       {:array, type, constraints} ->
-        parameterized_type({:array, Ash.Type.get_type(type)}, constraints, false)
+        parameterized_type({:array, Ash.Type.get_type(type)}, constraints)
 
       {type, constraints} ->
-        parameterized_type(type, constraints, false)
+        parameterized_type(type, constraints)
 
       type ->
-        parameterized_type(type, [], false)
+        parameterized_type(type, [])
     end
   end
 
@@ -241,22 +241,20 @@ defmodule AshPostgres.SqlImplementation do
   end
 
   @impl true
-  def parameterized_type(type, constraints, no_maps? \\ true)
-
-  def parameterized_type({:parameterized, _} = type, _, _) do
+  def parameterized_type({:parameterized, _} = type, _) do
     type
   end
 
-  def parameterized_type({:parameterized, _, _} = type, _, _) do
+  def parameterized_type({:parameterized, _, _} = type, _) do
     type
   end
 
-  def parameterized_type({:in, type}, constraints, no_maps?) do
-    parameterized_type({:array, type}, constraints, no_maps?)
+  def parameterized_type({:in, type}, constraints) do
+    parameterized_type({:array, type}, constraints)
   end
 
-  def parameterized_type({:array, type}, constraints, _) do
-    case parameterized_type(type, constraints[:items] || [], false) do
+  def parameterized_type({:array, type}, constraints) do
+    case parameterized_type(type, constraints[:items] || []) do
       nil ->
         nil
 
@@ -265,31 +263,23 @@ defmodule AshPostgres.SqlImplementation do
     end
   end
 
-  def parameterized_type({type, constraints}, [], no_maps?) do
-    parameterized_type(type, constraints, no_maps?)
+  def parameterized_type({type, constraints}, []) do
+    parameterized_type(type, constraints)
   end
 
-  def parameterized_type(Ash.Type.CiString, constraints, no_maps?) do
-    parameterized_type(AshPostgres.Type.CiStringWrapper, constraints, no_maps?)
+  def parameterized_type(Ash.Type.CiString, constraints) do
+    parameterized_type(AshPostgres.Type.CiStringWrapper, constraints)
   end
 
-  def parameterized_type(Ash.Type.String, constraints, no_maps?) do
-    parameterized_type(AshPostgres.Type.StringWrapper, constraints, no_maps?)
+  def parameterized_type(Ash.Type.String, constraints) do
+    parameterized_type(AshPostgres.Type.StringWrapper, constraints)
   end
 
-  def parameterized_type(:tsquery, constraints, no_maps?) do
-    parameterized_type(AshPostgres.Tsquery, constraints, no_maps?)
+  def parameterized_type(:tsquery, constraints) do
+    parameterized_type(AshPostgres.Tsquery, constraints)
   end
 
-  def parameterized_type(type, _constraints, false)
-      when type in [Ash.Type.Map, Ash.Type.Map.EctoType],
-      do: :map
-
-  def parameterized_type(type, _constraints, true)
-      when type in [Ash.Type.Map, Ash.Type.Map.EctoType],
-      do: nil
-
-  def parameterized_type(type, constraints, no_maps?) do
+  def parameterized_type(type, constraints) do
     if Ash.Type.ash_type?(type) do
       cast_in_query? =
         if function_exported?(Ash.Type, :cast_in_query?, 2) do
@@ -301,7 +291,7 @@ defmodule AshPostgres.SqlImplementation do
       if cast_in_query? do
         type = Ash.Type.ecto_type(type)
 
-        parameterized_type(type, constraints, no_maps?)
+        parameterized_type(type, constraints)
       else
         nil
       end
@@ -312,7 +302,7 @@ defmodule AshPostgres.SqlImplementation do
         else
           case type.type(constraints || []) do
             :ci_string ->
-              parameterized_type(AshPostgres.Type.CiStringWrapper, constraints, no_maps?)
+              parameterized_type(AshPostgres.Type.CiStringWrapper, constraints)
 
             _ ->
               Ecto.ParameterizedType.init(type, constraints || [])

test/calculation_test.exs

@@ -776,6 +776,18 @@ defmodule AshPostgres.CalculationTest do
   end
 
   describe "maps" do
+    test "literal maps inside of conds can be loaded" do
+      post =
+        Post
+        |> Ash.Changeset.for_create(:create, %{title: "match", score: 42})
+        |> Ash.create!()
+
+      assert Ash.load!(post, :literal_map_in_expr).literal_map_in_expr == %{
+               match: true,
+               of: "match"
+             }
+    end
+
     test "maps can reference filtered aggregates" do
       post =
         Post

test/support/resources/post.ex

@@ -789,6 +789,25 @@ defmodule AshPostgres.Test.Post do
       load: [:count_of_comments, :count_of_linked_posts]
     )
 
+    calculate(
+      :literal_map_in_expr,
+      :map,
+      expr(
+        cond do
+          title == "match" ->
+            %{match: true, of: "match"}
+
+          title == "not-match" ->
+            %{match: true, of: "not-match"}
+
+          true ->
+            %{match: false}
+        end
+      )
+    ) do
+      constraints(fields: [match: [type: :boolean], of: [type: :string]])
+    end
+
     calculate :similarity,
               :boolean,
               expr(fragment("(to_tsvector(?) @@ ?)", title, ^arg(:search))) do