Fix paths in array_agg

Author: easafe

src/Droplet/Language/Internal/Function.purs

@@ -68,7 +68,12 @@ class ToArrayAgg (f ∷ Type) (fields ∷ Row Type) (t ∷ Type) | f → fields
 
 instance (Cons name t e fields, UnwrapDefinition t u) ⇒ ToArrayAgg (Proxy name) fields u
 
-instance (Cons name t e fields, UnwrapDefinition t u) ⇒ ToArrayAgg (Path alias name) fields u
+instance
+      ( AppendPath alias name fullPath
+      , Cons fullPath t e fields
+      , UnwrapDefinition t u
+      ) ⇒
+      ToArrayAgg (Path alias name) fields u
 
 -- | Function arguments must match input type
 class MatchArgumentList (input ∷ Type) (args ∷ Type) (fields ∷ Row Type)

src/Droplet/Language/Internal/Syntax.purs

@@ -737,8 +737,10 @@ instance
       ToArrayAgg (OrderBy (Proxy name) (Proxy otherName)) fields w
 
 instance
-      ( Cons name t e fields
-      , Cons otherName v r fields
+      ( AppendPath alias name fullPath
+      , Cons fullPath t e fields
+      , AppendPath otherAlias otherName otherFullPath
+      , Cons otherFullPath v r fields
       , UnwrapDefinition v w
       ) ⇒
       ToArrayAgg (OrderBy (Path alias name) (Path otherAlias otherName)) fields w

test/Function.purs

@@ -1,6 +1,6 @@
 module Test.Function where
 
-import Prelude
+import Prelude hiding (join)
 
 import Data.BigInt as DB
 import Data.Maybe (Maybe(..))
@@ -89,6 +89,10 @@ tests = TS.describe "functions" do
                   let q = select (array_agg (u ... id) # as u) # from (users # as u)
                   TM.notParameterized """SELECT array_agg("u"."id") AS "u" FROM "users" AS "u"""" $ DLIQ.buildQuery q
                   TM.result q [ { u: Just [1, 2] } ]
+            TS.it "joined source" do
+                  let q = select (array_agg (u ... id) # as u) # from (join (users # as u) (messages # as t) # on (u ... id .=. t ... id))
+                  TM.notParameterized """SELECT array_agg("u"."id") AS "u" FROM "users" AS "u" INNER JOIN "messages" AS "t" ON "u"."id" = "t"."id"""" $ DLIQ.buildQuery q
+                  TM.result q [ { u: Just [1, 2] } ]
             TS.describe "order by" do
                   TS.it "field" do
                         let q = select (array_agg (id # orderBy id) # as u) # from users