Commitac0568b

committed

feat: support named aggregates

1 parent52cc180 commitac0568bCopy full SHA for ac0568b

File tree

+25

-1

lines changed

+25

-1

lines changed

Lines changed: 25 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ defmodule AshPostgres.DataLayer do`
`293`	`293`	`defpadd_to_select(`
`294`	`294`	`%{expr:{:merge,_,[first,{:%{},_,[{:aggregates,{:%{},[],fields}}]}]}}=select,`
`295`	`295`	`binding,`
`296`		`-aggregate`
	`296`	`+%{load:nil}=aggregate`
`297`	`297`	`)do`
`298`	`298`	`field=`
`299`	`299`	`{:type,[],`
`@@ -319,6 +319,30 @@ defmodule AshPostgres.DataLayer do`
`319`	`319`	`%{select\|expr:{:merge,[],[first,{:%{},[],[{:aggregates,{:%{},[],new_fields}}]}]}}`
`320`	`320`	`end`
`321`	`321`
	`322`	`+defpadd_to_select(`
	`323`	`+%{expr:expr}=select,`
	`324`	`+binding,`
	`325`	`+%{load:load_as}=aggregate`
	`326`	`+)do`
	`327`	`+field=`
	`328`	`+{:type,[],`
	`329`	`+[`
	`330`	`+{{:.,[],[{:&,[],[binding]},aggregate.name]},[],[]},`
	`331`	`+Ash.Type.ecto_type(aggregate.type)`
	`332`	`+]}`
	`333`	`+`
	`334`	`+field_with_default=`
	`335`	`+ifaggregate.default_valuedo`
	`336`	`+{:coalesce,[],`
	`337`	`+[`
	`338`	`+field,`
	`339`	`+aggregate.default_value`
	`340`	`+]}`
	`341`	`+end`
	`342`	`+`
	`343`	`+%{select\|expr:{:merge,[],[expr,{:%{},[],[{load_as,field_with_default}]}]}}`
	`344`	`+end`
	`345`	`+`
`322`	`346`	`defpadd_aggregate_to_subquery(query,resource,aggregate,binding)do`
`323`	`347`	`new_joins=`
`324`	`348`	`List.update_at(query.joins,binding-1,fnjoin->`

Comments

(0)