on dev help sign in
subquery expression generalize condition
commit015d2c16e53222caa8e44b1cb1d49707f23673b0 authorEitan Chatav <eitan.chatav@gmail.com> dateWed 5 Sep 2018, 11:56 (8 years ago) parent31bfd2a
1 file changed+28−28
squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+28−28
squeal-postgresql/src/Squeal/PostgreSQL/Query.hs+28−28
@@ -1096,7 +1096,7 @@ unsafeSubqueryExpression
10961096 :: ByteString
10971097 -> Expression schema from grp params ty
10981098 -> Query schema params '[alias ::: ty]
1099− -> Condition schema from grp params
1099+ -> Expression schema from grp params (nullity 'PGbool)
11001100unsafeSubqueryExpression op x q = UnsafeExpression $
11011101 renderExpression x <+> op <+> parenthesized (renderQuery q)
11021102
@@ -1105,7 +1105,7 @@ unsafeRowSubqueryExpression
11051105 => ByteString
11061106 -> NP (Aliased (Expression schema from grp params)) row
11071107 -> Query schema params row
1108− -> Condition schema from grp params
1108+ -> Expression schema from grp params (nullity 'PGbool)
11091109unsafeRowSubqueryExpression op xs q = UnsafeExpression $
11101110 renderExpression (row xs) <+> op <+> parenthesized (renderQuery q)
11111111
@@ -1120,7 +1120,7 @@ unsafeRowSubqueryExpression op xs q = UnsafeExpression $
11201120in_
11211121 :: Expression schema from grp params ty -- ^ expression
11221122 -> Query schema params '[alias ::: ty] -- ^ subquery
1123− -> Condition schema from grp params
1123+ -> Expression schema from grp params (nullity 'PGbool)
11241124in_ = unsafeSubqueryExpression "IN"
11251125
11261126{- | The left-hand side of this form of `rowIn` is a row constructor.
@@ -1141,7 +1141,7 @@ rowIn
11411141 :: SListI row
11421142 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
11431143 -> Query schema params row -- ^ subquery
1144− -> Condition schema from grp params
1144+ -> Expression schema from grp params (nullity 'PGbool)
11451145rowIn = unsafeRowSubqueryExpression "IN"
11461146
11471147-- | >>> printSQL $ true `eqAll` values_ (true `as` #foo)
@@ -1149,7 +1149,7 @@ rowIn = unsafeRowSubqueryExpression "IN"
11491149eqAll
11501150 :: Expression schema from grp params ty -- ^ expression
11511151 -> Query schema params '[alias ::: ty] -- ^ subquery
1152− -> Condition schema from grp params
1152+ -> Expression schema from grp params (nullity 'PGbool)
11531153eqAll = unsafeSubqueryExpression "= ALL"
11541154
11551155-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1159,7 +1159,7 @@ rowEqAll
11591159 :: SListI row
11601160 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
11611161 -> Query schema params row -- ^ subquery
1162− -> Condition schema from grp params
1162+ -> Expression schema from grp params (nullity 'PGbool)
11631163rowEqAll = unsafeRowSubqueryExpression "= ALL"
11641164
11651165-- | >>> printSQL $ true `eqAny` values_ (true `as` #foo)
@@ -1167,7 +1167,7 @@ rowEqAll = unsafeRowSubqueryExpression "= ALL"
11671167eqAny
11681168 :: Expression schema from grp params ty -- ^ expression
11691169 -> Query schema params '[alias ::: ty] -- ^ subquery
1170− -> Condition schema from grp params
1170+ -> Expression schema from grp params (nullity 'PGbool)
11711171eqAny = unsafeSubqueryExpression "= ANY"
11721172
11731173-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1177,7 +1177,7 @@ rowEqAny
11771177 :: SListI row
11781178 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
11791179 -> Query schema params row -- ^ subquery
1180− -> Condition schema from grp params
1180+ -> Expression schema from grp params (nullity 'PGbool)
11811181rowEqAny = unsafeRowSubqueryExpression "= ANY"
11821182
11831183-- | >>> printSQL $ true `neqAll` values_ (true `as` #foo)
@@ -1185,7 +1185,7 @@ rowEqAny = unsafeRowSubqueryExpression "= ANY"
11851185neqAll
11861186 :: Expression schema from grp params ty -- ^ expression
11871187 -> Query schema params '[alias ::: ty] -- ^ subquery
1188− -> Condition schema from grp params
1188+ -> Expression schema from grp params (nullity 'PGbool)
11891189neqAll = unsafeSubqueryExpression "<> ALL"
11901190
11911191-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1195,7 +1195,7 @@ rowNeqAll
11951195 :: SListI row
11961196 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
11971197 -> Query schema params row -- ^ subquery
1198− -> Condition schema from grp params
1198+ -> Expression schema from grp params (nullity 'PGbool)
11991199rowNeqAll = unsafeRowSubqueryExpression "<> ALL"
12001200
12011201-- | >>> printSQL $ true `neqAny` values_ (true `as` #foo)
@@ -1203,7 +1203,7 @@ rowNeqAll = unsafeRowSubqueryExpression "<> ALL"
12031203neqAny
12041204 :: Expression schema from grp params ty -- ^ expression
12051205 -> Query schema params '[alias ::: ty] -- ^ subquery
1206− -> Condition schema from grp params
1206+ -> Expression schema from grp params (nullity 'PGbool)
12071207neqAny = unsafeSubqueryExpression "<> ANY"
12081208
12091209-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1213,7 +1213,7 @@ rowNeqAny
12131213 :: SListI row
12141214 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
12151215 -> Query schema params row -- ^ subquery
1216− -> Condition schema from grp params
1216+ -> Expression schema from grp params (nullity 'PGbool)
12171217rowNeqAny = unsafeRowSubqueryExpression "<> ANY"
12181218
12191219-- | >>> printSQL $ true `allLt` values_ (true `as` #foo)
@@ -1221,7 +1221,7 @@ rowNeqAny = unsafeRowSubqueryExpression "<> ANY"
12211221allLt
12221222 :: Expression schema from grp params ty -- ^ expression
12231223 -> Query schema params '[alias ::: ty] -- ^ subquery
1224− -> Condition schema from grp params
1224+ -> Expression schema from grp params (nullity 'PGbool)
12251225allLt = unsafeSubqueryExpression "ALL <"
12261226
12271227-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1231,7 +1231,7 @@ rowLtAll
12311231 :: SListI row
12321232 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
12331233 -> Query schema params row -- ^ subquery
1234− -> Condition schema from grp params
1234+ -> Expression schema from grp params (nullity 'PGbool)
12351235rowLtAll = unsafeRowSubqueryExpression "ALL <"
12361236
12371237-- | >>> printSQL $ true `ltAny` values_ (true `as` #foo)
@@ -1239,7 +1239,7 @@ rowLtAll = unsafeRowSubqueryExpression "ALL <"
12391239ltAny
12401240 :: Expression schema from grp params ty -- ^ expression
12411241 -> Query schema params '[alias ::: ty] -- ^ subquery
1242− -> Condition schema from grp params
1242+ -> Expression schema from grp params (nullity 'PGbool)
12431243ltAny = unsafeSubqueryExpression "ANY <"
12441244
12451245-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1249,7 +1249,7 @@ rowLtAny
12491249 :: SListI row
12501250 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
12511251 -> Query schema params row -- ^ subquery
1252− -> Condition schema from grp params
1252+ -> Expression schema from grp params (nullity 'PGbool)
12531253rowLtAny = unsafeRowSubqueryExpression "ANY <"
12541254
12551255-- | >>> printSQL $ true `lteAll` values_ (true `as` #foo)
@@ -1257,7 +1257,7 @@ rowLtAny = unsafeRowSubqueryExpression "ANY <"
12571257lteAll
12581258 :: Expression schema from grp params ty -- ^ expression
12591259 -> Query schema params '[alias ::: ty] -- ^ subquery
1260− -> Condition schema from grp params
1260+ -> Expression schema from grp params (nullity 'PGbool)
12611261lteAll = unsafeSubqueryExpression "<= ALL"
12621262
12631263-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1267,7 +1267,7 @@ rowLteAll
12671267 :: SListI row
12681268 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
12691269 -> Query schema params row -- ^ subquery
1270− -> Condition schema from grp params
1270+ -> Expression schema from grp params (nullity 'PGbool)
12711271rowLteAll = unsafeRowSubqueryExpression "<= ALL"
12721272
12731273-- | >>> printSQL $ true `lteAny` values_ (true `as` #foo)
@@ -1275,7 +1275,7 @@ rowLteAll = unsafeRowSubqueryExpression "<= ALL"
12751275lteAny
12761276 :: Expression schema from grp params ty -- ^ expression
12771277 -> Query schema params '[alias ::: ty] -- ^ subquery
1278− -> Condition schema from grp params
1278+ -> Expression schema from grp params (nullity 'PGbool)
12791279lteAny = unsafeSubqueryExpression "<= ANY"
12801280
12811281-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1285,7 +1285,7 @@ rowLteAny
12851285 :: SListI row
12861286 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
12871287 -> Query schema params row -- ^ subquery
1288− -> Condition schema from grp params
1288+ -> Expression schema from grp params (nullity 'PGbool)
12891289rowLteAny = unsafeRowSubqueryExpression "<= ANY"
12901290
12911291-- | >>> printSQL $ true `gtAll` values_ (true `as` #foo)
@@ -1293,7 +1293,7 @@ rowLteAny = unsafeRowSubqueryExpression "<= ANY"
12931293gtAll
12941294 :: Expression schema from grp params ty -- ^ expression
12951295 -> Query schema params '[alias ::: ty] -- ^ subquery
1296− -> Condition schema from grp params
1296+ -> Expression schema from grp params (nullity 'PGbool)
12971297gtAll = unsafeSubqueryExpression "> ALL"
12981298
12991299-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1303,7 +1303,7 @@ rowGtAll
13031303 :: SListI row
13041304 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
13051305 -> Query schema params row -- ^ subquery
1306− -> Condition schema from grp params
1306+ -> Expression schema from grp params (nullity 'PGbool)
13071307rowGtAll = unsafeRowSubqueryExpression "> ALL"
13081308
13091309-- | >>> printSQL $ true `gtAny` values_ (true `as` #foo)
@@ -1311,7 +1311,7 @@ rowGtAll = unsafeRowSubqueryExpression "> ALL"
13111311gtAny
13121312 :: Expression schema from grp params ty -- ^ expression
13131313 -> Query schema params '[alias ::: ty] -- ^ subquery
1314− -> Condition schema from grp params
1314+ -> Expression schema from grp params (nullity 'PGbool)
13151315gtAny = unsafeSubqueryExpression "> ANY"
13161316
13171317-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1321,7 +1321,7 @@ rowGtAny
13211321 :: SListI row
13221322 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
13231323 -> Query schema params row -- ^ subquery
1324− -> Condition schema from grp params
1324+ -> Expression schema from grp params (nullity 'PGbool)
13251325rowGtAny = unsafeRowSubqueryExpression "> ANY"
13261326
13271327-- | >>> printSQL $ true `gteAll` values_ (true `as` #foo)
@@ -1329,7 +1329,7 @@ rowGtAny = unsafeRowSubqueryExpression "> ANY"
13291329gteAll
13301330 :: Expression schema from grp params ty -- ^ expression
13311331 -> Query schema params '[alias ::: ty] -- ^ subquery
1332− -> Condition schema from grp params
1332+ -> Expression schema from grp params (nullity 'PGbool)
13331333gteAll = unsafeSubqueryExpression ">= ALL"
13341334
13351335-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1339,7 +1339,7 @@ rowGteAll
13391339 :: SListI row
13401340 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
13411341 -> Query schema params row -- ^ subquery
1342− -> Condition schema from grp params
1342+ -> Expression schema from grp params (nullity 'PGbool)
13431343rowGteAll = unsafeRowSubqueryExpression ">= ALL"
13441344
13451345-- | >>> printSQL $ true `gteAny` values_ (true `as` #foo)
@@ -1347,7 +1347,7 @@ rowGteAll = unsafeRowSubqueryExpression ">= ALL"
13471347gteAny
13481348 :: Expression schema from grp params ty -- ^ expression
13491349 -> Query schema params '[alias ::: ty] -- ^ subquery
1350− -> Condition schema from grp params
1350+ -> Expression schema from grp params (nullity 'PGbool)
13511351gteAny = unsafeSubqueryExpression ">= ANY"
13521352
13531353-- | >>> let myRow = 1 `as` #foo :* false `as` #bar :: NP (Aliased (Expression '[] '[] 'Ungrouped '[])) '["foo" ::: 'NotNull 'PGint2, "bar" ::: 'NotNull 'PGbool]
@@ -1357,7 +1357,7 @@ rowGteAny
13571357 :: SListI row
13581358 => NP (Aliased (Expression schema from grp params)) row -- ^ row constructor
13591359 -> Query schema params row -- ^ subquery
1360− -> Condition schema from grp params
1360+ -> Expression schema from grp params (nullity 'PGbool)
13611361rowGteAny = unsafeRowSubqueryExpression ">= ANY"
13621362
13631363-- | A `CommonTableExpression` is an auxiliary statement in a `with` clause.