Commitad9d18a

committed

improvement: join relationships for aggregate filters

1 parent9769d99 commitad9d18aCopy full SHA for ad9d18a

File tree

+29

-5

lines changed

+29

-5

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,11 @@ defmodule AshPostgres.Aggregate do`
`109`	`109`	`first_relationship.destination,`
`110`	`110`	`first_relationship,`
`111`	`111`	`query,`
`112`		`-[first_relationship.name]`
	`112`	`+[first_relationship.name],`
	`113`	`+nil,`
	`114`	`+nil,`
	`115`	`+true,`
	`116`	`+true`
`113`	`117`	`),`
`114`	`118`	`agg_root_query<-`
`115`	`119`	`Map.update!(`
`@@ -441,7 +445,9 @@ defmodule AshPostgres.Aggregate do`
`441`	`445`	`query,`
`442`	`446`	`[join_relationship],`
`443`	`447`	`nil,`
`444`		`-subquery.__ash_bindings__.current`
	`448`	`+subquery.__ash_bindings__.current,`
	`449`	`+true,`
	`450`	`+true`
`445`	`451`	`)`
`446`	`452`
`447`	`453`	`field=first_relationship.source_attribute_on_join_resource`

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,8 @@ defmodule AshPostgres.Join do`
`183`	`183`	`path\\[],`
`184`	`184`	`bindings\\nil,`
`185`	`185`	`start_binding\\nil,`
`186`		`-is_subquery?\\true`
	`186`	`+is_subquery?\\true,`
	`187`	`+join_relationships?\\false`
`187`	`188`	`)do`
`188`	`189`	`resource`
`189`	`190`	`\|>Ash.Query.new(nil,base_filter?:false)`
`@@ -203,6 +204,25 @@ defmodule AshPostgres.Join do`
`203`	`204`	`initial_query:initial_query`
`204`	`205`	`)do`
`205`	`206`	`{:ok,query}->`
	`207`	`+query=`
	`208`	`+ifjoin_relationships?do`
	`209`	`+{:ok,related_filter}=`
	`210`	`+Ash.Filter.hydrate_refs(`
	`211`	`+relationship.filter,`
	`212`	`+%{`
	`213`	`+resource:relationship.destination,`
	`214`	`+public?:false`
	`215`	`+}`
	`216`	`+)`
	`217`	`+`
	`218`	`+{:ok,query}=`
	`219`	`+AshPostgres.Join.join_all_relationships(query,related_filter)`
	`220`	`+`
	`221`	`+query`
	`222`	`+else`
	`223`	`+query`
	`224`	`+end`
	`225`	`+`
`206`	`226`	`query=`
`207`	`227`	`query`
`208`	`228`	`\|>do_base_filter(`
`@@ -785,8 +805,6 @@ defmodule AshPostgres.Join do`
`785`	`805`	`relationship.filter,`
`786`	`806`	`%{`
`787`	`807`	`resource:relationship.destination,`
`788`		`-aggregates:%{},`
`789`		`-calculations:%{},`
`790`	`808`	`public?:false`
`791`	`809`	`}`
`792`	`810`	`)`

Comments

(0)