@@ -19,6 +19,7 @@ Squeal data definition language.
20 , LambdaCase
20 , LambdaCase
21 , MultiParamTypeClasses
21 , MultiParamTypeClasses
22 , OverloadedStrings
23 , OverloadedStrings
23 , RankNTypes
24 , RankNTypes
24 , ScopedTypeVariables
25 , ScopedTypeVariables
@@ -61,8 +62,8 @@ module Squeal.PostgreSQL.Definition
61 , OnDeleteClause (..)
62 , OnDeleteClause (..)
62 , OnUpdateClause (..)
63 , OnUpdateClause (..)
63 , FunctionDefinition(..)
64 , FunctionDefinition(..)
64− , languageSql
65+ , languageSqlExpr
65− , languageSqlSet
66+ , languageSqlQuery
66 -- ** Drop
67 -- ** Drop
67 , dropSchema
68 , dropSchema
68 , dropTable
69 , dropTable
@@ -1161,16 +1162,17 @@ createOrReplaceFunction fun args ret fundef = UnsafeDefinition $
1161 <+> parenthesized (renderCommaSeparated renderSQL args)
1162 <+> parenthesized (renderCommaSeparated renderSQL args)
1162 <+> "RETURNS" <+> renderSQL ret <+> renderSQL fundef <> ";"
1163 <+> "RETURNS" <+> renderSQL ret <+> renderSQL fundef <> ";"
1164−languageSql
1165+languageSqlExpr
1165− :: Query '[] '[] schemas args '[col ::: ret]
1166+ :: Expression '[] '[] 'Ungrouped schemas args '[] ret
1166 -> FunctionDefinition schemas args ('Returns ret)
1167 -> FunctionDefinition schemas args ('Returns ret)
1167−languageSql qry = UnsafeFunctionDefinition $
1168+languageSqlExpr expr = UnsafeFunctionDefinition $
1168− "language sql as" <+> "$$" <+> renderSQL qry <+> "$$"
1169+ "language sql as"
1170+ <+> "$$" <+> renderSQL (values_ (expr `as` #ret :* Nil)) <+> "$$"
1170−languageSqlSet
1172+languageSqlQuery
1171 :: Query '[] '[] schemas args rets
1173 :: Query '[] '[] schemas args rets
1172 -> FunctionDefinition schemas args ('ReturnsTable rets)
1174 -> FunctionDefinition schemas args ('ReturnsTable rets)
1173−languageSqlSet qry = UnsafeFunctionDefinition $
1175+languageSqlQuery qry = UnsafeFunctionDefinition $
1174 "language sql as" <+> "$$" <+> renderSQL qry <+> "$$"
1176 "language sql as" <+> "$$" <+> renderSQL qry <+> "$$"
1176createSetFunction
1178createSetFunction