git.iko.soy/squeal
on dev help sign in
fix docs

and add outer-outer scope to subqueries

commitf08c960b899fe797855e3b703261038c52f9830c authorEitan Chatav <eitan@Eitans-MacBook-Pro.local> dateWed 20 Feb 2019, 11:24 (8 years ago) parent56e5e47
3 files changed+64−63
compare with dev
unifiedsplit
squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+21−21 squeal-postgresql/src/Squeal/PostgreSQL/Manipulation.hs+2−1 squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+41−41
squeal-postgresql/src/Squeal/PostgreSQL/Expression.hs+21−21
@@ -1427,7 +1427,7 @@ class Aggregate expr1 expr2 aggr
14271427 --
14281428 -- >>> :{
14291429 -- let
1430− -- expression :: Expression outer ('Grouped bys) commons schemas params from ('NotNull 'PGint8)
1430+ -- expression :: Expression '[] ('Grouped bys) commons schemas params from ('NotNull 'PGint8)
14311431 -- expression = countStar
14321432 -- in printSQL expression
14331433 -- :}
@@ -1436,7 +1436,7 @@ class Aggregate expr1 expr2 aggr
14361436
14371437 -- | >>> :{
14381438 -- let
1439− -- expression :: Expression outer ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity ty]] ('NotNull 'PGint8)
1439+ -- expression :: Expression '[] ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity ty]] ('NotNull 'PGint8)
14401440 -- expression = count (All #col)
14411441 -- in printSQL expression
14421442 -- :}
@@ -1448,7 +1448,7 @@ class Aggregate expr1 expr2 aggr
14481448
14491449 -- | >>> :{
14501450 -- let
1451− -- expression :: Expression outer ('Grouped bys) commons schemas params '[tab ::: '["col" ::: 'Null 'PGnumeric]] ('Null 'PGnumeric)
1451+ -- expression :: Expression '[] ('Grouped bys) commons schemas params '[tab ::: '["col" ::: 'Null 'PGnumeric]] ('Null 'PGnumeric)
14521452 -- expression = sum_ (Distinct #col)
14531453 -- in printSQL expression
14541454 -- :}
@@ -1475,7 +1475,7 @@ class Aggregate expr1 expr2 aggr
14751475
14761476 -- | >>> :{
14771477 -- let
1478− -- expression :: Expression outer ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGint4]] (nullity 'PGint4)
1478+ -- expression :: Expression '[] ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGint4]] (nullity 'PGint4)
14791479 -- expression = bitAnd (Distinct #col)
14801480 -- in printSQL expression
14811481 -- :}
@@ -1488,7 +1488,7 @@ class Aggregate expr1 expr2 aggr
14881488
14891489 -- | >>> :{
14901490 -- let
1491− -- expression :: Expression outer ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGint4]] (nullity 'PGint4)
1491+ -- expression :: Expression '[] ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGint4]] (nullity 'PGint4)
14921492 -- expression = bitOr (All #col)
14931493 -- in printSQL expression
14941494 -- :}
@@ -1501,7 +1501,7 @@ class Aggregate expr1 expr2 aggr
15011501
15021502 -- | >>> :{
15031503 -- let
1504− -- winFun :: WindowFunction 'Ungrouped commons schemas params '[tab ::: '["col" ::: nullity 'PGbool]] (nullity 'PGbool)
1504+ -- winFun :: WindowFunction '[] 'Ungrouped commons schemas params '[tab ::: '["col" ::: nullity 'PGbool]] (nullity 'PGbool)
15051505 -- winFun = boolAnd #col
15061506 -- in printSQL winFun
15071507 -- :}
@@ -1513,7 +1513,7 @@ class Aggregate expr1 expr2 aggr
15131513
15141514 -- | >>> :{
15151515 -- let
1516− -- expression :: Expression outer ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGbool]] (nullity 'PGbool)
1516+ -- expression :: Expression '[] ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGbool]] (nullity 'PGbool)
15171517 -- expression = boolOr (All #col)
15181518 -- in printSQL expression
15191519 -- :}
@@ -1527,7 +1527,7 @@ class Aggregate expr1 expr2 aggr
15271527 --
15281528 -- >>> :{
15291529 -- let
1530− -- expression :: Expression outer ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGbool]] (nullity 'PGbool)
1530+ -- expression :: Expression '[] ('Grouped bys) commons schemas params '[tab ::: '["col" ::: nullity 'PGbool]] (nullity 'PGbool)
15311531 -- expression = every (Distinct #col)
15321532 -- in printSQL expression
15331533 -- :}
@@ -1548,7 +1548,7 @@ class Aggregate expr1 expr2 aggr
15481548 :: expr1 (nullity ty)
15491549 -- ^ what to minimize
15501550 -> aggr (nullity ty)
1551−
1551+
15521552 -- | average aggregation
15531553 avg
15541554 :: expr1 (nullity ty)
@@ -1558,7 +1558,7 @@ class Aggregate expr1 expr2 aggr
15581558 {- | correlation coefficient
15591559 >>> :{
15601560 let
1561− expression :: Expression o ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
1561+ expression :: Expression '[] ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
15621562 expression = corr (All (#y :*: #x))
15631563 in printSQL expression
15641564 :}
@@ -1571,7 +1571,7 @@ class Aggregate expr1 expr2 aggr
15711571 {- | population covariance
15721572 >>> :{
15731573 let
1574− expression :: Expression o ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
1574+ expression :: Expression '[] ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
15751575 expression = covarPop (All (#y :*: #x))
15761576 in printSQL expression
15771577 :}
@@ -1584,7 +1584,7 @@ class Aggregate expr1 expr2 aggr
15841584 {- | sample covariance
15851585 >>> :{
15861586 let
1587− winFun :: WindowFunction 'Ungrouped c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
1587+ winFun :: WindowFunction '[] 'Ungrouped c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
15881588 winFun = covarSamp (#y :*: #x)
15891589 in printSQL winFun
15901590 :}
@@ -1597,7 +1597,7 @@ class Aggregate expr1 expr2 aggr
15971597 {- | average of the independent variable (sum(X)/N)
15981598 >>> :{
15991599 let
1600− expression :: Expression o ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
1600+ expression :: Expression '[] ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
16011601 expression = regrAvgX (All (#y :*: #x))
16021602 in printSQL expression
16031603 :}
@@ -1610,7 +1610,7 @@ class Aggregate expr1 expr2 aggr
16101610 {- | average of the dependent variable (sum(Y)/N)
16111611 >>> :{
16121612 let
1613− winFun :: WindowFunction 'Ungrouped c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
1613+ winFun :: WindowFunction '[] 'Ungrouped c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
16141614 winFun = regrAvgY (#y :*: #x)
16151615 in printSQL winFun
16161616 :}
@@ -1623,7 +1623,7 @@ class Aggregate expr1 expr2 aggr
16231623 {- | number of input rows in which both expressions are nonnull
16241624 >>> :{
16251625 let
1626− winFun :: WindowFunction 'Ungrouped c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGint8)
1626+ winFun :: WindowFunction '[] 'Ungrouped c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGint8)
16271627 winFun = regrCount (#y :*: #x)
16281628 in printSQL winFun
16291629 :}
@@ -1636,7 +1636,7 @@ class Aggregate expr1 expr2 aggr
16361636 {- | y-intercept of the least-squares-fit linear equation determined by the (X, Y) pairs
16371637 >>> :{
16381638 let
1639− expression :: Expression o ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
1639+ expression :: Expression '[] ('Grouped g) c s p '[t ::: '["x" ::: 'NotNull 'PGfloat8, "y" ::: 'NotNull 'PGfloat8]] ('NotNull 'PGfloat8)
16401640 expression = regrIntercept (All (#y :*: #x))
16411641 in printSQL expression
16421642 :}
@@ -1674,27 +1674,27 @@ class Aggregate expr1 expr2 aggr
16741674 regrSyy
16751675 :: expr2 (nullity 'PGfloat8)
16761676 -> aggr (nullity 'PGfloat8)
1677−
1677+
16781678 -- | historical alias for `stddevSamp`
16791679 stddev
16801680 :: expr1 (nullity ty)
16811681 -> aggr (nullity (PGAvg ty))
1682−
1682+
16831683 -- | population standard deviation of the input values
16841684 stddevPop
16851685 :: expr1 (nullity ty)
16861686 -> aggr (nullity (PGAvg ty))
1687−
1687+
16881688 -- | sample standard deviation of the input values
16891689 stddevSamp
16901690 :: expr1 (nullity ty)
16911691 -> aggr (nullity (PGAvg ty))
1692−
1692+
16931693 -- | historical alias for `varSamp`
16941694 variance
16951695 :: expr1 (nullity ty)
16961696 -> aggr (nullity (PGAvg ty))
1697−
1697+
16981698 -- | population variance of the input values
16991699 -- (square of the population standard deviation)
17001700 varPop
squeal-postgresql/src/Squeal/PostgreSQL/Manipulation.hs+2−1
@@ -173,9 +173,10 @@ type Schema3 =
173173let
174174 manipulation :: Manipulation '[] (Public Schema3) '[] '[]
175175 manipulation =
176− deleteFrom_ #tab (Using (table #other_tab & also (table #third_tab)))
176+ deleteFrom #tab (Using (table #other_tab & also (table #third_tab)))
177177 ( (#tab ! #col2 .== #other_tab ! #col2)
178178 .&& (#tab ! #col2 .== #third_tab ! #col2) )
179+ (Returning_ Nil)
179180in printSQL manipulation
180181:}
181182DELETE FROM "tab" USING "other_tab" AS "other_tab", "third_tab" AS "third_tab" WHERE (("tab"."col2" = "other_tab"."col2") AND ("tab"."col2" = "third_tab"."col2"))
squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+41−41
@@ -143,7 +143,7 @@ simple query:
143143>>> type Schema = '["tab" ::: 'Table ('[] :=> Columns)]
144144>>> :{
145145let
146− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
146+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
147147 query = select Star (from (table #tab))
148148in printSQL query
149149:}
@@ -153,7 +153,7 @@ restricted query:
153153
154154>>> :{
155155let
156− query :: Query '[] (Public Schema) '[] '["sum" ::: 'NotNull 'PGint4, "col1" ::: 'NotNull 'PGint4]
156+ query :: Query '[] '[] (Public Schema) '[] '["sum" ::: 'NotNull 'PGint4, "col1" ::: 'NotNull 'PGint4]
157157 query =
158158 select_ ((#col1 + #col2) `as` #sum :* #col1)
159159 ( from (table #tab)
@@ -167,7 +167,7 @@ subquery:
167167
168168>>> :{
169169let
170− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
170+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
171171 query = select Star (from (subquery (select Star (from (table #tab)) `as` #sub)))
172172in printSQL query
173173:}
@@ -177,7 +177,7 @@ limits and offsets:
177177
178178>>> :{
179179let
180− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
180+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
181181 query = select Star (from (table #tab) & limit 100 & offset 2 & limit 50 & offset 2)
182182in printSQL query
183183:}
@@ -187,7 +187,7 @@ parameterized query:
187187
188188>>> :{
189189let
190− query :: Query '[] (Public Schema) '[ 'NotNull 'PGint4] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
190+ query :: Query '[] '[] (Public Schema) '[ 'NotNull 'PGint4] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
191191 query = select Star (from (table #tab) & where_ (#col1 .> param @1))
192192in printSQL query
193193:}
@@ -197,7 +197,7 @@ aggregation query:
197197
198198>>> :{
199199let
200− query :: Query '[] (Public Schema) '[] '["sum" ::: 'NotNull 'PGint4, "col1" ::: 'NotNull 'PGint4 ]
200+ query :: Query '[] '[] (Public Schema) '[] '["sum" ::: 'NotNull 'PGint4, "col1" ::: 'NotNull 'PGint4 ]
201201 query =
202202 select_ (sum_ (All #col2) `as` #sum :* #col1)
203203 ( from (table (#tab `as` #table1))
@@ -211,7 +211,7 @@ sorted query:
211211
212212>>> :{
213213let
214− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
214+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
215215 query = select Star (from (table #tab) & orderBy [#col1 & Asc])
216216in printSQL query
217217:}
@@ -248,7 +248,7 @@ type OrdersSchema =
248248
249249>>> :{
250250let
251− query :: Query '[] (Public OrdersSchema)
251+ query :: Query '[] '[] (Public OrdersSchema)
252252 '[]
253253 '[ "order_price" ::: 'NotNull 'PGfloat4
254254 , "customer_name" ::: 'NotNull 'PGtext
@@ -271,7 +271,7 @@ self-join:
271271
272272>>> :{
273273let
274− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
274+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
275275 query = select (#t1 & DotStar) (from (table (#tab `as` #t1) & crossJoin (table (#tab `as` #t2))))
276276in printSQL query
277277:}
@@ -281,7 +281,7 @@ value queries:
281281
282282>>> :{
283283let
284− query :: Query outer commons schemas '[] '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
284+ query :: Query '[] commons schemas '[] '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
285285 query = values (1 `as` #foo :* true `as` #bar) [2 `as` #foo :* false `as` #bar]
286286in printSQL query
287287:}
@@ -291,7 +291,7 @@ set operations:
291291
292292>>> :{
293293let
294− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
294+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
295295 query = select Star (from (table #tab)) `unionAll` select Star (from (table #tab))
296296in printSQL query
297297:}
@@ -301,7 +301,7 @@ with queries:
301301
302302>>> :{
303303let
304− query :: Query '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
304+ query :: Query '[] '[] (Public Schema) '[] '["col1" ::: 'NotNull 'PGint4, "col2" ::: 'NotNull 'PGint4]
305305 query = with (
306306 select Star (from (table #tab)) `as` #cte1 :>>
307307 select Star (from (common #cte1)) `as` #cte2
@@ -314,7 +314,7 @@ window function queries
314314
315315>>> :{
316316let
317− query :: Query '[] (Public Schema) '[] ["col1" ::: 'NotNull 'PGint4, "rank" ::: 'NotNull 'PGint8]
317+ query :: Query '[] '[] (Public Schema) '[] ["col1" ::: 'NotNull 'PGint4, "rank" ::: 'NotNull 'PGint8]
318318 query = select
319319 (#col1 & Also (rank `as` #rank `Over` (partitionBy #col1 & orderBy [#col2 & Asc])))
320320 (from (table #tab))
@@ -1061,7 +1061,7 @@ instance RenderSQL (HavingClause outer grp commons schemas params from) where
10611061unsafeSubqueryExpression
10621062 :: ByteString
10631063 -> Expression outer grp commons schemas params from ty
1064− -> Query from commons schemas params '[alias ::: ty]
1064+ -> Query (Join outer from) commons schemas params '[alias ::: ty]
10651065 -> Expression outer grp commons schemas params from (nullity 'PGbool)
10661066unsafeSubqueryExpression op x q = UnsafeExpression $
10671067 renderSQL x <+> op <+> parenthesized (renderSQL q)
@@ -1070,7 +1070,7 @@ unsafeRowSubqueryExpression
10701070 :: SListI row
10711071 => ByteString
10721072 -> NP (Aliased (Expression outer grp commons schemas params from)) row
1073− -> Query from commons schemas params row
1073+ -> Query (Join outer from) commons schemas params row
10741074 -> Expression outer grp commons schemas params from (nullity 'PGbool)
10751075unsafeRowSubqueryExpression op xs q = UnsafeExpression $
10761076 renderSQL (row xs) <+> op <+> parenthesized (renderSQL q)
@@ -1085,7 +1085,7 @@ unsafeRowSubqueryExpression op xs q = UnsafeExpression $
10851085-- TRUE IN (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
10861086in_
10871087 :: Expression outer grp commons schemas params from ty -- ^ expression
1088− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1088+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
10891089 -> Expression outer grp commons schemas params from (nullity 'PGbool)
10901090in_ = unsafeSubqueryExpression "IN"
10911091
@@ -1106,7 +1106,7 @@ ROW(1, FALSE) IN (SELECT * FROM (VALUES (1, FALSE)) AS t ("foo", "bar"))
11061106rowIn
11071107 :: SListI row
11081108 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1109− -> Query from commons schemas params row -- ^ subquery
1109+ -> Query (Join outer from) commons schemas params row -- ^ subquery
11101110 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11111111rowIn = unsafeRowSubqueryExpression "IN"
11121112
@@ -1114,7 +1114,7 @@ rowIn = unsafeRowSubqueryExpression "IN"
11141114-- TRUE = ALL (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
11151115eqAll
11161116 :: Expression outer grp commons schemas params from ty -- ^ expression
1117− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1117+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
11181118 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11191119eqAll = unsafeSubqueryExpression "= ALL"
11201120
@@ -1124,7 +1124,7 @@ eqAll = unsafeSubqueryExpression "= ALL"
11241124rowEqAll
11251125 :: SListI row
11261126 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1127− -> Query from commons schemas params row -- ^ subquery
1127+ -> Query (Join outer from) commons schemas params row -- ^ subquery
11281128 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11291129rowEqAll = unsafeRowSubqueryExpression "= ALL"
11301130
@@ -1132,7 +1132,7 @@ rowEqAll = unsafeRowSubqueryExpression "= ALL"
11321132-- TRUE = ANY (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
11331133eqAny
11341134 :: Expression outer grp commons schemas params from ty -- ^ expression
1135− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1135+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
11361136 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11371137eqAny = unsafeSubqueryExpression "= ANY"
11381138
@@ -1142,7 +1142,7 @@ eqAny = unsafeSubqueryExpression "= ANY"
11421142rowEqAny
11431143 :: SListI row
11441144 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1145− -> Query from commons schemas params row -- ^ subquery
1145+ -> Query (Join outer from) commons schemas params row -- ^ subquery
11461146 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11471147rowEqAny = unsafeRowSubqueryExpression "= ANY"
11481148
@@ -1150,7 +1150,7 @@ rowEqAny = unsafeRowSubqueryExpression "= ANY"
11501150-- TRUE <> ALL (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
11511151neqAll
11521152 :: Expression outer grp commons schemas params from ty -- ^ expression
1153− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1153+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
11541154 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11551155neqAll = unsafeSubqueryExpression "<> ALL"
11561156
@@ -1160,7 +1160,7 @@ neqAll = unsafeSubqueryExpression "<> ALL"
11601160rowNeqAll
11611161 :: SListI row
11621162 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1163− -> Query from commons schemas params row -- ^ subquery
1163+ -> Query (Join outer from) commons schemas params row -- ^ subquery
11641164 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11651165rowNeqAll = unsafeRowSubqueryExpression "<> ALL"
11661166
@@ -1168,7 +1168,7 @@ rowNeqAll = unsafeRowSubqueryExpression "<> ALL"
11681168-- TRUE <> ANY (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
11691169neqAny
11701170 :: Expression outer grp commons schemas params from ty -- ^ expression
1171− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1171+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
11721172 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11731173neqAny = unsafeSubqueryExpression "<> ANY"
11741174
@@ -1178,7 +1178,7 @@ neqAny = unsafeSubqueryExpression "<> ANY"
11781178rowNeqAny
11791179 :: SListI row
11801180 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1181− -> Query from commons schemas params row -- ^ subquery
1181+ -> Query (Join outer from) commons schemas params row -- ^ subquery
11821182 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11831183rowNeqAny = unsafeRowSubqueryExpression "<> ANY"
11841184
@@ -1186,7 +1186,7 @@ rowNeqAny = unsafeRowSubqueryExpression "<> ANY"
11861186-- TRUE ALL < (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
11871187allLt
11881188 :: Expression outer grp commons schemas params from ty -- ^ expression
1189− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1189+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
11901190 -> Expression outer grp commons schemas params from (nullity 'PGbool)
11911191allLt = unsafeSubqueryExpression "ALL <"
11921192
@@ -1196,7 +1196,7 @@ allLt = unsafeSubqueryExpression "ALL <"
11961196rowLtAll
11971197 :: SListI row
11981198 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1199− -> Query from commons schemas params row -- ^ subquery
1199+ -> Query (Join outer from) commons schemas params row -- ^ subquery
12001200 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12011201rowLtAll = unsafeRowSubqueryExpression "ALL <"
12021202
@@ -1204,7 +1204,7 @@ rowLtAll = unsafeRowSubqueryExpression "ALL <"
12041204-- TRUE ANY < (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
12051205ltAny
12061206 :: Expression outer grp commons schemas params from ty -- ^ expression
1207− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1207+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
12081208 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12091209ltAny = unsafeSubqueryExpression "ANY <"
12101210
@@ -1214,7 +1214,7 @@ ltAny = unsafeSubqueryExpression "ANY <"
12141214rowLtAny
12151215 :: SListI row
12161216 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1217− -> Query from commons schemas params row -- ^ subquery
1217+ -> Query (Join outer from) commons schemas params row -- ^ subquery
12181218 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12191219rowLtAny = unsafeRowSubqueryExpression "ANY <"
12201220
@@ -1222,7 +1222,7 @@ rowLtAny = unsafeRowSubqueryExpression "ANY <"
12221222-- TRUE <= ALL (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
12231223lteAll
12241224 :: Expression outer grp commons schemas params from ty -- ^ expression
1225− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1225+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
12261226 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12271227lteAll = unsafeSubqueryExpression "<= ALL"
12281228
@@ -1232,7 +1232,7 @@ lteAll = unsafeSubqueryExpression "<= ALL"
12321232rowLteAll
12331233 :: SListI row
12341234 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1235− -> Query from commons schemas params row -- ^ subquery
1235+ -> Query (Join outer from) commons schemas params row -- ^ subquery
12361236 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12371237rowLteAll = unsafeRowSubqueryExpression "<= ALL"
12381238
@@ -1240,7 +1240,7 @@ rowLteAll = unsafeRowSubqueryExpression "<= ALL"
12401240-- TRUE <= ANY (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
12411241lteAny
12421242 :: Expression outer grp commons schemas params from ty -- ^ expression
1243− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1243+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
12441244 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12451245lteAny = unsafeSubqueryExpression "<= ANY"
12461246
@@ -1250,7 +1250,7 @@ lteAny = unsafeSubqueryExpression "<= ANY"
12501250rowLteAny
12511251 :: SListI row
12521252 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1253− -> Query from commons schemas params row -- ^ subquery
1253+ -> Query (Join outer from) commons schemas params row -- ^ subquery
12541254 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12551255rowLteAny = unsafeRowSubqueryExpression "<= ANY"
12561256
@@ -1258,7 +1258,7 @@ rowLteAny = unsafeRowSubqueryExpression "<= ANY"
12581258-- TRUE > ALL (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
12591259gtAll
12601260 :: Expression outer grp commons schemas params from ty -- ^ expression
1261− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1261+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
12621262 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12631263gtAll = unsafeSubqueryExpression "> ALL"
12641264
@@ -1268,7 +1268,7 @@ gtAll = unsafeSubqueryExpression "> ALL"
12681268rowGtAll
12691269 :: SListI row
12701270 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1271− -> Query from commons schemas params row -- ^ subquery
1271+ -> Query (Join outer from) commons schemas params row -- ^ subquery
12721272 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12731273rowGtAll = unsafeRowSubqueryExpression "> ALL"
12741274
@@ -1276,7 +1276,7 @@ rowGtAll = unsafeRowSubqueryExpression "> ALL"
12761276-- TRUE > ANY (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
12771277gtAny
12781278 :: Expression outer grp commons schemas params from ty -- ^ expression
1279− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1279+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
12801280 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12811281gtAny = unsafeSubqueryExpression "> ANY"
12821282
@@ -1286,7 +1286,7 @@ gtAny = unsafeSubqueryExpression "> ANY"
12861286rowGtAny
12871287 :: SListI row
12881288 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1289− -> Query from commons schemas params row -- ^ subquery
1289+ -> Query (Join outer from) commons schemas params row -- ^ subquery
12901290 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12911291rowGtAny = unsafeRowSubqueryExpression "> ANY"
12921292
@@ -1294,7 +1294,7 @@ rowGtAny = unsafeRowSubqueryExpression "> ANY"
12941294-- TRUE >= ALL (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
12951295gteAll
12961296 :: Expression outer grp commons schemas params from ty -- ^ expression
1297− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1297+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
12981298 -> Expression outer grp commons schemas params from (nullity 'PGbool)
12991299gteAll = unsafeSubqueryExpression ">= ALL"
13001300
@@ -1304,7 +1304,7 @@ gteAll = unsafeSubqueryExpression ">= ALL"
13041304rowGteAll
13051305 :: SListI row
13061306 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1307− -> Query from commons schemas params row -- ^ subquery
1307+ -> Query (Join outer from) commons schemas params row -- ^ subquery
13081308 -> Expression outer grp commons schemas params from (nullity 'PGbool)
13091309rowGteAll = unsafeRowSubqueryExpression ">= ALL"
13101310
@@ -1312,7 +1312,7 @@ rowGteAll = unsafeRowSubqueryExpression ">= ALL"
13121312-- TRUE >= ANY (SELECT * FROM (VALUES (TRUE)) AS t ("foo"))
13131313gteAny
13141314 :: Expression outer grp commons schemas params from ty -- ^ expression
1315− -> Query from commons schemas params '[alias ::: ty] -- ^ subquery
1315+ -> Query (Join outer from) commons schemas params '[alias ::: ty] -- ^ subquery
13161316 -> Expression outer grp commons schemas params from (nullity 'PGbool)
13171317gteAny = unsafeSubqueryExpression ">= ANY"
13181318
@@ -1322,7 +1322,7 @@ gteAny = unsafeSubqueryExpression ">= ANY"
13221322rowGteAny
13231323 :: SListI row
13241324 => NP (Aliased (Expression outer grp commons schemas params from)) row -- ^ row constructor
1325− -> Query from commons schemas params row -- ^ subquery
1325+ -> Query (Join outer from) commons schemas params row -- ^ subquery
13261326 -> Expression outer grp commons schemas params from (nullity 'PGbool)
13271327rowGteAny = unsafeRowSubqueryExpression ">= ANY"
13281328