@@ -2,36 +2,47 @@ module Yoga.Postgres.Schema where
3import Prelude
3import Prelude
5−import Data.Array as Array
5+import Control.Monad.Except (except, runExcept)
6import Data.Array (intercalate, mapWithIndex, foldl)
6import Data.Array (intercalate, mapWithIndex, foldl)
7+import Data.Array as Array
8+import Data.Date (Date, day, month, year)
7−import Data.DateTime (DateTime)
9+import Data.DateTime (DateTime(..))
10+import Data.Either (Either(..), note)
11+import Data.Enum (fromEnum, toEnum)
12+import Data.Int as Int
8import Data.JSDate as JSDate
13import Data.JSDate as JSDate
14+import Data.List.Types (NonEmptyList)
15+import Data.Map as Map
9−import Data.Maybe (Maybe(..))
16+import Data.Maybe (Maybe(..), fromMaybe)
10import Data.Newtype (class Newtype)
17import Data.Newtype (class Newtype)
11import Data.Nullable (toNullable)
18import Data.Nullable (toNullable)
12−import JS.BigInt (BigInt)
19+import Data.Number as Number
13−import Unsafe.Coerce (unsafeCoerce)
14import Data.Reflectable (class Reflectable, reflectType)
20import Data.Reflectable (class Reflectable, reflectType)
21+import Data.String.CodeUnits as SCU
22+import Data.String.Common as Str
23+import Data.String.Pattern (Pattern(..))
15−import Data.String.Regex (regex, replace') as Regex
24+import Data.String.Regex (Regex, regex, replace') as Regex
16−import Data.String.Regex (Regex) as Regex
17import Data.String.Regex.Flags (global) as Regex
25import Data.String.Regex.Flags (global) as Regex
18−import Control.Monad.Except (runExcept)
19−import Data.Either (Either(..))
20−import Data.Map as Map
21import Data.Symbol (class IsSymbol, reflectSymbol)
26import Data.Symbol (class IsSymbol, reflectSymbol)
22−import Type.Function (type (#))
27+import Data.Time (Time(..))
28+import Data.Traversable (traverse)
29+import Data.UUID (UUID)
30+import Data.UUID as UUID
23−import Effect.Aff (Aff)
31+import Effect.Aff (Aff, throwError)
32+import Effect.Exception (error) as Exception
24−import Foreign (Foreign, unsafeToForeign)
33+import Foreign (Foreign, ForeignError(..))
34+import JS.BigInt (BigInt)
25import Prim.Boolean (True, False)
35import Prim.Boolean (True, False)
26import Prim.Row (class Cons, class Lacks, class Union, class Nub) as Row
36import Prim.Row (class Cons, class Lacks, class Union, class Nub) as Row
27−import Prim.RowList as RL
28import Prim.RowList (class RowToList)
37import Prim.RowList (class RowToList)
38+import Prim.RowList as RL
29import Prim.Symbol (class Cons, class Append) as Symbol
39import Prim.Symbol (class Cons, class Append) as Symbol
30import Prim.TypeError (class Fail, Beside, Text, Quote)
40import Prim.TypeError (class Fail, Beside, Text, Quote)
31import Record (get) as Record
41import Record (get) as Record
32import Type.Proxy (Proxy(..))
42import Type.Proxy (Proxy(..))
33import Type.RowList (class ListToRow)
43import Type.RowList (class ListToRow)
44+import Unsafe.Coerce (unsafeCoerce)
34−import Yoga.JSON (class ReadForeign, readImpl)
45+import Yoga.JSON (class ReadForeign, class WriteForeign, readImpl, writeImpl)
35import Yoga.Postgres as PG
46import Yoga.Postgres as PG
37-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
48-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -57,6 +68,9 @@ data Unique a
58data Default :: forall k. k -> Type -> Type
69data Default :: forall k. k -> Type -> Type
59data Default val a
70data Default val a
71+data DefaultExpr :: Symbol -> Type -> Type
72+data DefaultExpr expression a
61data References
75data References
@@ -78,6 +92,178 @@ derive instance Newtype Jsonb _
78instance ReadForeign Jsonb where
92instance ReadForeign Jsonb where
79 readImpl = pure <<< Jsonb
93 readImpl = pure <<< Jsonb
95+instance WriteForeign Jsonb where
96+ writeImpl (Jsonb value) = value
98+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
99+-- PGUUID: newtype over Data.UUID.UUID for Postgres integration
100+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
102+newtype PGUUID = PGUUID UUID
104+derive instance Newtype PGUUID _
105+derive newtype instance Eq PGUUID
106+derive newtype instance Ord PGUUID
107+derive newtype instance Show PGUUID
109+instance ReadForeign PGUUID where
111+ s :: String <- readImpl f
112+ pure (unsafeCoerce s)
114+instance WriteForeign PGUUID where
115+ writeImpl (PGUUID uuid) = writeImpl (UUID.toString uuid)
117+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
118+-- PGDate / PGTime: newtypes for DATE and TIME columns
119+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
121+newtype PGDate = PGDate Date
123+derive instance Newtype PGDate _
124+derive instance Eq PGDate
125+derive instance Ord PGDate
126+instance Show PGDate where
127+ show (PGDate d) = "(PGDate " <> show d <> ")"
129+instance ReadForeign PGDate where
131+ except $ note (pure (ForeignError "Invalid date")) (JSDate.toDate jsDate <#> PGDate)
133+ jsDate :: JSDate.JSDate
134+ jsDate = unsafeCoerce f
136+instance WriteForeign PGDate where
137+ writeImpl (PGDate date) =
139+ ( show (fromEnum (year date))
141+ <> pad2 (fromEnum (month date))
143+ <> pad2 (fromEnum (day date))
146+ pad2 n = if n < 10 then "0" <> show n else show n
148+newtype TimestampTZ = TimestampTZ DateTime
150+derive instance Newtype TimestampTZ _
151+derive instance Eq TimestampTZ
152+derive instance Ord TimestampTZ
153+instance Show TimestampTZ where
154+ show (TimestampTZ dt) = "(TimestampTZ " <> show dt <> ")"
156+instance ReadForeign TimestampTZ where
158+ except $ note (pure (ForeignError "Invalid timestamp")) (JSDate.toDateTime jsDate <#> TimestampTZ)
160+ jsDate :: JSDate.JSDate
161+ jsDate = unsafeCoerce f
163+newtype PGTime = PGTime Time
165+derive instance Newtype PGTime _
166+derive instance Eq PGTime
167+derive instance Ord PGTime
168+instance Show PGTime where
169+ show (PGTime t) = "(PGTime " <> show t <> ")"
171+instance ReadForeign PGTime where
173+ s :: String <- readImpl f
174+ except $ note (pure (ForeignError ("Invalid time: " <> s))) (parseTime s)
177+ let parts = Str.split (Pattern ":") str
179+ [ hStr, mStr, sStr ] -> do
180+ h <- Int.fromString hStr >>= toEnum
181+ mi <- Int.fromString mStr >>= toEnum
182+ let secParts = Str.split (Pattern ".") sStr
183+ s <- Int.fromString (fromMaybe sStr (Array.head secParts)) >>= toEnum
184+ let fraction = fromMaybe "" (Array.index secParts 1)
185+ let milliseconds = case SCU.length fraction of
187+ 1 -> fraction <> "00"
188+ 2 -> fraction <> "0"
189+ _ -> SCU.take 3 fraction
190+ let ms = fromMaybe bottom (Int.fromString milliseconds >>= toEnum)
191+ pure (PGTime (Time h mi s ms))
194+instance WriteForeign PGTime where
195+ writeImpl (PGTime (Time hour minute second millisecond)) =
197+ ( pad2 (fromEnum hour)
199+ <> pad2 (fromEnum minute)
201+ <> pad2 (fromEnum second)
203+ <> pad3 (fromEnum millisecond)
206+ pad2 n = if n < 10 then "0" <> show n else show n
208+ | n < 10 = "00" <> show n
209+ | n < 100 = "0" <> show n
210+ | otherwise = show n
212+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
213+-- Point: geometric point "(x,y)"
214+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
216+newtype Point = Point { x :: Number, y :: Number }
218+derive instance Newtype Point _
219+derive instance Eq Point
221+instance Show Point where
222+ show (Point { x, y }) = "(Point " <> show x <> " " <> show y <> ")"
224+instance ReadForeign Point where
226+ s :: String <- readImpl f
227+ except $ note (pure (ForeignError ("Invalid point: " <> s))) (parsePoint s)
230+ let inner = SCU.drop 1 (SCU.dropRight 1 str)
231+ let parts = Str.split (Pattern ",") inner
233+ [ xStr, yStr ] -> do
234+ x <- Number.fromString xStr
235+ y <- Number.fromString yStr
236+ pure (Point { x, y })
239+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
240+-- TSVector / TSQuery: full-text search types
241+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
243+newtype TSVector = TSVector String
245+derive instance Newtype TSVector _
246+derive newtype instance Eq TSVector
247+derive newtype instance Ord TSVector
248+derive newtype instance Show TSVector
250+instance ReadForeign TSVector where
252+ s :: String <- readImpl f
255+newtype TSQuery = TSQuery String
257+derive instance Newtype TSQuery _
258+derive newtype instance Eq TSQuery
259+derive newtype instance Ord TSQuery
260+derive newtype instance Show TSQuery
262+instance ReadForeign TSQuery where
264+ s :: String <- readImpl f
81-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
267-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
82-- Nullability: inferred from Maybe
268-- Nullability: inferred from Maybe
83-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
269-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -101,6 +287,7 @@ instance ExtractType a typ => ExtractType (PrimaryKey a) typ
101else instance ExtractType a typ => ExtractType (AutoIncrement a) typ
287else instance ExtractType a typ => ExtractType (AutoIncrement a) typ
102else instance ExtractType a typ => ExtractType (Unique a) typ
288else instance ExtractType a typ => ExtractType (Unique a) typ
103else instance ExtractType a typ => ExtractType (Default val a) typ
289else instance ExtractType a typ => ExtractType (Default val a) typ
290+else instance ExtractType a typ => ExtractType (DefaultExpr expression a) typ
104else instance ExtractType a typ => ExtractType (ForeignKey t r c a) typ
291else instance ExtractType a typ => ExtractType (ForeignKey t r c a) typ
105else instance ExtractType a typ => ExtractType (Nullable a) (Maybe typ)
292else instance ExtractType a typ => ExtractType (Nullable a) (Maybe typ)
106else instance ExtractType a a
293else instance ExtractType a a
@@ -130,6 +317,27 @@ instance PGTypeName DateTime where
130instance PGTypeName BigInt where
317instance PGTypeName BigInt where
131 pgTypeName _ = "BIGINT"
318 pgTypeName _ = "BIGINT"
320+instance PGTypeName PGUUID where
321+ pgTypeName _ = "UUID"
323+instance PGTypeName TimestampTZ where
324+ pgTypeName _ = "TIMESTAMPTZ"
326+instance PGTypeName PGDate where
327+ pgTypeName _ = "DATE"
329+instance PGTypeName PGTime where
330+ pgTypeName _ = "TIME"
332+instance PGTypeName Point where
333+ pgTypeName _ = "POINT"
335+instance PGTypeName TSVector where
336+ pgTypeName _ = "TSVECTOR"
338+instance PGTypeName TSQuery where
339+ pgTypeName _ = "TSQUERY"
133instance PGTypeName Jsonb where
341instance PGTypeName Jsonb where
134 pgTypeName _ = "JSONB"
342 pgTypeName _ = "JSONB"
@@ -152,8 +360,24 @@ instance Reflectable sym String => RenderDefaultValue sym String where
152instance Reflectable val Int => RenderDefaultValue val Int where
360instance Reflectable val Int => RenderDefaultValue val Int where
153 renderDefaultValue _ _ = "DEFAULT " <> show (reflectType (Proxy :: Proxy val))
361 renderDefaultValue _ _ = "DEFAULT " <> show (reflectType (Proxy :: Proxy val))
363+instance RenderDefaultValue True Boolean where
364+ renderDefaultValue _ _ = "DEFAULT true"
155−instance Reflectable val Boolean => RenderDefaultValue val Boolean where
366+instance RenderDefaultValue False Boolean where
156− renderDefaultValue _ _ = if reflectType (Proxy :: Proxy val) then "DEFAULT true" else "DEFAULT false"
367+ renderDefaultValue _ _ = "DEFAULT false"
369+instance RenderDefaultValue "true" Boolean where
370+ renderDefaultValue _ _ = "DEFAULT true"
372+instance RenderDefaultValue "false" Boolean where
373+ renderDefaultValue _ _ = "DEFAULT false"
375+instance RenderDefaultValue "now()" TimestampTZ where
376+ renderDefaultValue _ _ = "DEFAULT now()"
378+instance RenderDefaultValue "gen_random_uuid()" PGUUID where
379+ renderDefaultValue _ _ = "DEFAULT gen_random_uuid()"
158class RenderConstraint a where
382class RenderConstraint a where
159 renderConstraint :: Proxy a -> String
383 renderConstraint :: Proxy a -> String
@@ -170,6 +394,10 @@ else instance RenderConstraint a => RenderConstraint (Unique a) where
170else instance (RenderDefaultValue val a, RenderConstraint a) => RenderConstraint (Default val a) where
394else instance (RenderDefaultValue val a, RenderConstraint a) => RenderConstraint (Default val a) where
171 renderConstraint _ = joinConstraints (renderDefaultValue (Proxy :: Proxy val) (Proxy :: Proxy a)) (renderConstraint (Proxy :: Proxy a))
395 renderConstraint _ = joinConstraints (renderDefaultValue (Proxy :: Proxy val) (Proxy :: Proxy a)) (renderConstraint (Proxy :: Proxy a))
397+else instance (IsSymbol expression, RenderConstraint a) => RenderConstraint (DefaultExpr expression a) where
398+ renderConstraint _ = joinConstraints
399+ ("DEFAULT " <> reflectSymbol (Proxy :: Proxy expression))
400+ (renderConstraint (Proxy :: Proxy a))
173else instance (IsSymbol table, IsSymbol col, RenderConstraint a) => RenderConstraint (ForeignKey table References col a) where
401else instance (IsSymbol table, IsSymbol col, RenderConstraint a) => RenderConstraint (ForeignKey table References col a) where
174 renderConstraint _ = joinConstraints
402 renderConstraint _ = joinConstraints
175 ("REFERENCES " <> reflectSymbol (Proxy :: Proxy table) <> "(" <> reflectSymbol (Proxy :: Proxy col) <> ")")
403 ("REFERENCES " <> reflectSymbol (Proxy :: Proxy table) <> "(" <> reflectSymbol (Proxy :: Proxy col) <> ")")
@@ -230,6 +458,11 @@ instance
230 let columns = renderColumnsRL (Proxy :: Proxy rl)
458 let columns = renderColumnsRL (Proxy :: Proxy rl)
231 "CREATE TABLE " <> tableName <> " (" <> intercalate ", " columns <> ")"
459 "CREATE TABLE " <> tableName <> " (" <> intercalate ", " columns <> ")"
461+createTableDDLIfNotExists :: forall @a. CreateTableDDL a => String
462+createTableDDLIfNotExists = do
463+ let ddl = createTableDDL @a
464+ "CREATE TABLE IF NOT EXISTS" <> SCU.drop 12 ddl
233-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
466-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
234-- INSERT SQL generation
467-- INSERT SQL generation
235-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
468-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -241,6 +474,8 @@ instance IsAutoGenerated (AutoIncrement a) where
241 isAutoGenerated _ = true
474 isAutoGenerated _ = true
242else instance IsAutoGenerated (Default v a) where
475else instance IsAutoGenerated (Default v a) where
243 isAutoGenerated _ = true
476 isAutoGenerated _ = true
477+else instance IsAutoGenerated (DefaultExpr expression a) where
478+ isAutoGenerated _ = true
244else instance IsAutoGenerated a => IsAutoGenerated (PrimaryKey a) where
479else instance IsAutoGenerated a => IsAutoGenerated (PrimaryKey a) where
245 isAutoGenerated _ = isAutoGenerated (Proxy :: Proxy a)
480 isAutoGenerated _ = isAutoGenerated (Proxy :: Proxy a)
246else instance IsAutoGenerated a => IsAutoGenerated (Unique a) where
481else instance IsAutoGenerated a => IsAutoGenerated (Unique a) where
@@ -284,15 +519,18 @@ instance
284 insertSQLFor = do
519 insertSQLFor = do
285 let tableName = reflectSymbol (Proxy :: Proxy name)
520 let tableName = reflectSymbol (Proxy :: Proxy name)
286 let cols = insertColumnsRL (Proxy :: Proxy rl)
521 let cols = insertColumnsRL (Proxy :: Proxy rl)
522+ if Array.null cols then
523+ "INSERT INTO " <> tableName <> " DEFAULT VALUES RETURNING *"
287− let placeholders = cols # mapWithIndex \i _ -> "$" <> show (i + 1)
525+ let placeholders = cols # mapWithIndex \i _ -> "$" <> show (i + 1)
288− "INSERT INTO " <> tableName
526+ "INSERT INTO " <> tableName
290− <> intercalate ", " cols
528+ <> intercalate ", " cols
292− <> " VALUES ("
530+ <> " VALUES ("
293− <> intercalate ", " placeholders
531+ <> intercalate ", " placeholders
295− <> " RETURNING *"
533+ <> " RETURNING *"
297-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
535-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
298-- SELECT SQL generation
536-- SELECT SQL generation
@@ -747,6 +985,15 @@ else instance
748 ParseSelectHandleAS "as" afterKeyword colRef tables accRL outRL
986 ParseSelectHandleAS "as" afterKeyword colRef tables accRL outRL
988+-- Bare alias (no AS keyword): "name n" means "name AS n"
990+ ( ResolveColumn colRef tables entry
991+ , ExtractType entry typ
992+ , SkipSpaces afterKeyword rest
993+ , ParseSelectExpectEnd rest tables (RL.Cons keyword typ accRL) outRL
995+ ParseSelectHandleAS keyword afterKeyword colRef tables accRL outRL
750class ParseSelectExpectEnd :: Symbol -> Row (Row Type) -> RL.RowList Type -> RL.RowList Type -> Constraint
997class ParseSelectExpectEnd :: Symbol -> Row (Row Type) -> RL.RowList Type -> RL.RowList Type -> Constraint
751class ParseSelectExpectEnd sym tables accRL outRL | sym tables accRL -> outRL
998class ParseSelectExpectEnd sym tables accRL outRL | sym tables accRL -> outRL
@@ -845,11 +1092,66 @@ instance ResolveAggregateArg "*" tables Star
845else instance ResolveAggregateArg "" tables Star
1092else instance ResolveAggregateArg "" tables Star
846else instance
1093else instance
847 ( SkipSpaces args trimmedFront
1094 ( SkipSpaces args trimmedFront
848− , ExtractWord trimmedFront col _rest
1095+ , ExtractIdent trimmedFront col rest
849− , ResolveAggregateArgCol col tables argType
1096+ , ResolveAggregateArgDispatch col rest tables argType
851 ResolveAggregateArg args tables argType
1098 ResolveAggregateArg args tables argType
1100+-- ExtractIdent: like ExtractWord but also stops at "(" so we can detect nested function calls
1101+class ExtractIdent :: Symbol -> Symbol -> Symbol -> Constraint
1102+class ExtractIdent sym word rest | sym -> word rest
1104+instance ExtractIdent "" "" ""
1106+ ( Symbol.Cons h t sym
1107+ , ExtractIdentGo h t "" word rest
1109+ ExtractIdent sym word rest
1111+class ExtractIdentGo :: Symbol -> Symbol -> Symbol -> Symbol -> Symbol -> Constraint
1112+class ExtractIdentGo head tail acc word rest | head tail acc -> word rest
1114+instance (SkipSpaces tail rest) => ExtractIdentGo " " tail acc acc rest
1115+else instance Symbol.Cons "," tail rest => ExtractIdentGo "," tail acc acc rest
1116+else instance Symbol.Append "(" tail rest => ExtractIdentGo "(" tail acc acc rest
1117+else instance Symbol.Append acc h word => ExtractIdentGo h "" acc word ""
1119+ ( Symbol.Append acc h acc'
1120+ , Symbol.Cons nextH nextT tail
1121+ , ExtractIdentGo nextH nextT acc' word rest
1123+ ExtractIdentGo h tail acc word rest
1125+-- After extracting the identifier, check if followed by "(" (nested function call) or not (column ref)
1126+class ResolveAggregateArgDispatch :: Symbol -> Symbol -> Row (Row Type) -> Type -> Constraint
1127+class ResolveAggregateArgDispatch col rest tables argType | col rest tables -> argType
1130+ ResolveAggregateArgCol col tables argType =>
1131+ ResolveAggregateArgDispatch col "" tables argType
1134+ ( Symbol.Cons h t rest
1135+ , ResolveAggregateArgDispatchByHead h t col tables argType
1137+ ResolveAggregateArgDispatch col rest tables argType
1139+class ResolveAggregateArgDispatchByHead :: Symbol -> Symbol -> Symbol -> Row (Row Type) -> Type -> Constraint
1140+class ResolveAggregateArgDispatchByHead head tail col tables argType | head tail col tables -> argType
1142+-- Nested function call: col(...)
1144+ ( ExtractUntilParen tail innerArgs _afterParen
1145+ , ResolveAggregateArg innerArgs tables innerArgType
1146+ , AggregateReturnType col innerArgType argType
1148+ ResolveAggregateArgDispatchByHead "(" tail col tables argType
1150+-- Not a function call: column reference
1152+ ResolveAggregateArgCol col tables argType =>
1153+ ResolveAggregateArgDispatchByHead h t col tables argType
853class ResolveAggregateArgCol :: Symbol -> Row (Row Type) -> Type -> Constraint
1155class ResolveAggregateArgCol :: Symbol -> Row (Row Type) -> Type -> Constraint
854class ResolveAggregateArgCol col tables argType | col tables -> argType
1156class ResolveAggregateArgCol col tables argType | col tables -> argType
@@ -934,8 +1236,8 @@ else instance
934class AggregateReturnTypeC :: Symbol -> Type -> Type -> Constraint
1236class AggregateReturnTypeC :: Symbol -> Type -> Type -> Constraint
935class AggregateReturnTypeC funcName argType returnType | funcName argType -> returnType
1237class AggregateReturnTypeC funcName argType returnType | funcName argType -> returnType
937−instance AggregateReturnTypeC "COUNT" argType Int
1239+instance AggregateReturnTypeC "COUNT" argType BigInt
938−else instance AggregateReturnTypeC "count" argType Int
1240+else instance AggregateReturnTypeC "count" argType BigInt
939else instance AggregateReturnTypeC "COALESCE" argType argType
1241else instance AggregateReturnTypeC "COALESCE" argType argType
940else instance AggregateReturnTypeC "coalesce" argType argType
1242else instance AggregateReturnTypeC "coalesce" argType argType
941else instance
1243else instance
@@ -1418,8 +1720,12 @@ else instance FlushWhereWordU word currentType tables paramsIn currentTypeOut pa
1418else instance FlushWhereWordU word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "u" word currentType tables paramsIn currentTypeOut paramsOut
1720else instance FlushWhereWordU word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "u" word currentType tables paramsIn currentTypeOut paramsOut
1419else instance FlushWhereWordV word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "V" word currentType tables paramsIn currentTypeOut paramsOut
1721else instance FlushWhereWordV word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "V" word currentType tables paramsIn currentTypeOut paramsOut
1420else instance FlushWhereWordV word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "v" word currentType tables paramsIn currentTypeOut paramsOut
1722else instance FlushWhereWordV word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "v" word currentType tables paramsIn currentTypeOut paramsOut
1723+else instance FlushWhereWordP word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "P" word currentType tables paramsIn currentTypeOut paramsOut
1724+else instance FlushWhereWordP word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "p" word currentType tables paramsIn currentTypeOut paramsOut
1725+else instance FlushWhereWordR word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "R" word currentType tables paramsIn currentTypeOut paramsOut
1726+else instance FlushWhereWordR word currentType tables paramsIn currentTypeOut paramsOut => FlushWhereWordByHead "r" word currentType tables paramsIn currentTypeOut paramsOut
1422−-- Catch-all: column reference (letters without keywords like g, h, p, q, r, w, x, y, z)
1728+-- Catch-all: column reference (letters without keywords like g, h, q, w, x, y, z)
1423else instance
1729else instance
1424 ( ResolveColumn word tables entry
1730 ( ResolveColumn word tables entry
1425 , ExtractType entry typ
1731 , ExtractType entry typ
@@ -1492,7 +1798,8 @@ else instance
1492class FlushWhereWordD :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1798class FlushWhereWordD :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1493class FlushWhereWordD word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1799class FlushWhereWordD word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1801+instance FlushWhereWordD "DATE" currentType tables paramsIn currentType paramsIn
1495−instance FlushWhereWordD "date" currentType tables paramsIn currentType paramsIn
1802+else instance FlushWhereWordD "date" currentType tables paramsIn currentType paramsIn
1496else instance
1803else instance
1497 ( ResolveColumn word tables entry
1804 ( ResolveColumn word tables entry
1498 , ExtractType entry typ
1805 , ExtractType entry typ
@@ -1607,7 +1914,9 @@ else instance
1607class FlushWhereWordS :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1914class FlushWhereWordS :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1608class FlushWhereWordS word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1915class FlushWhereWordS word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1917+instance FlushWhereWordS "SMALLINT" currentType tables paramsIn currentType paramsIn
1918+else instance FlushWhereWordS "smallint" currentType tables paramsIn currentType paramsIn
1610−instance FlushWhereWordS "SUM" currentType tables paramsIn currentType paramsIn
1919+else instance FlushWhereWordS "SUM" currentType tables paramsIn currentType paramsIn
1611else instance FlushWhereWordS "sum" currentType tables paramsIn currentType paramsIn
1920else instance FlushWhereWordS "sum" currentType tables paramsIn currentType paramsIn
1612else instance FlushWhereWordS "STRING_AGG" currentType tables paramsIn String paramsIn
1921else instance FlushWhereWordS "STRING_AGG" currentType tables paramsIn String paramsIn
1613else instance FlushWhereWordS "string_agg" currentType tables paramsIn String paramsIn
1922else instance FlushWhereWordS "string_agg" currentType tables paramsIn String paramsIn
@@ -1628,6 +1937,16 @@ else instance FlushWhereWordT "true" currentType tables paramsIn currentType par
1628else instance FlushWhereWordT "text" currentType tables paramsIn currentType paramsIn
1937else instance FlushWhereWordT "text" currentType tables paramsIn currentType paramsIn
1629else instance FlushWhereWordT "timestamptz" currentType tables paramsIn currentType paramsIn
1938else instance FlushWhereWordT "timestamptz" currentType tables paramsIn currentType paramsIn
1630else instance FlushWhereWordT "timestamp" currentType tables paramsIn currentType paramsIn
1939else instance FlushWhereWordT "timestamp" currentType tables paramsIn currentType paramsIn
1940+else instance FlushWhereWordT "TIME" currentType tables paramsIn currentType paramsIn
1941+else instance FlushWhereWordT "time" currentType tables paramsIn currentType paramsIn
1942+else instance FlushWhereWordT "tsvector" currentType tables paramsIn currentType paramsIn
1943+else instance FlushWhereWordT "TSVECTOR" currentType tables paramsIn currentType paramsIn
1944+else instance FlushWhereWordT "tsquery" currentType tables paramsIn currentType paramsIn
1945+else instance FlushWhereWordT "TSQUERY" currentType tables paramsIn currentType paramsIn
1946+else instance FlushWhereWordT "to_tsvector" currentType tables paramsIn String paramsIn
1947+else instance FlushWhereWordT "TO_TSVECTOR" currentType tables paramsIn String paramsIn
1948+else instance FlushWhereWordT "to_tsquery" currentType tables paramsIn String paramsIn
1949+else instance FlushWhereWordT "TO_TSQUERY" currentType tables paramsIn String paramsIn
1631else instance
1950else instance
1632 ( ResolveColumn word tables entry
1951 ( ResolveColumn word tables entry
1633 , ExtractType entry typ
1952 , ExtractType entry typ
@@ -1659,6 +1978,32 @@ else instance
1660 FlushWhereWordV word currentType tables paramsIn unwrapped paramsIn
1979 FlushWhereWordV word currentType tables paramsIn unwrapped paramsIn
1981+class FlushWhereWordP :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1982+class FlushWhereWordP word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1984+instance FlushWhereWordP "point" currentType tables paramsIn currentType paramsIn
1985+else instance FlushWhereWordP "POINT" currentType tables paramsIn currentType paramsIn
1986+else instance FlushWhereWordP "plainto_tsquery" currentType tables paramsIn currentType paramsIn
1987+else instance FlushWhereWordP "PLAINTO_TSQUERY" currentType tables paramsIn currentType paramsIn
1989+ ( ResolveColumn word tables entry
1990+ , ExtractType entry typ
1991+ , UnwrapMaybe typ unwrapped
1993+ FlushWhereWordP word currentType tables paramsIn unwrapped paramsIn
1995+class FlushWhereWordR :: Symbol -> Type -> Row (Row Type) -> RL.RowList Type -> Type -> RL.RowList Type -> Constraint
1996+class FlushWhereWordR word currentType tables paramsIn currentTypeOut paramsOut | word currentType tables paramsIn -> currentTypeOut paramsOut
1998+instance FlushWhereWordR "real" currentType tables paramsIn currentType paramsIn
1999+else instance FlushWhereWordR "REAL" currentType tables paramsIn currentType paramsIn
2001+ ( ResolveColumn word tables entry
2002+ , ExtractType entry typ
2003+ , UnwrapMaybe typ unwrapped
2005+ FlushWhereWordR word currentType tables paramsIn unwrapped paramsIn
1662-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
2007-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
1663-- ValidateColumnList: comma-separated column references
2008-- ValidateColumnList: comma-separated column references
1664-- Used by GROUP BY, DISTINCT ON, ON CONFLICT target
2009-- Used by GROUP BY, DISTINCT ON, ON CONFLICT target
@@ -2312,13 +2657,85 @@ else instance
2312 , SkipSpaces rest1 rest2
2657 , SkipSpaces rest1 rest2
2313 , ExpectChar rest2 "=" rest3
2658 , ExpectChar rest2 "=" rest3
2314 , SkipSpaces rest3 rest4
2659 , SkipSpaces rest3 rest4
2315− , ExtractWord rest4 excRef rest5
2660+ , SkipExpression rest4 rest5
2316− , ValidateExcludedRef excRef colName
2317− , SkipSpaces rest5 rest6
2318− , ParseAssignmentsContinue rest6 cols
2661+ , ParseAssignmentsContinue rest5 cols
2320 ParseAssignments sym cols
2663 ParseAssignments sym cols
2665+-- | Skip a SQL expression on the RHS of an assignment.
2666+-- | Handles balanced parentheses so that e.g. now() and
2667+-- | COALESCE(EXCLUDED.value, '') are consumed as a single expression.
2668+-- | Stops at an unparenthesised comma or end-of-string.
2669+class SkipExpression :: Symbol -> Symbol -> Constraint
2670+class SkipExpression sym rest | sym -> rest
2672+instance SkipExpression "" ""
2674+ ( Symbol.Cons h t sym
2675+ , SkipExpressionGo h t rest
2677+ SkipExpression sym rest
2679+class SkipExpressionGo :: Symbol -> Symbol -> Symbol -> Constraint
2680+class SkipExpressionGo head tail rest | head tail -> rest
2682+-- Comma at depth 0 → stop, keep comma in rest
2683+instance Symbol.Cons "," tail rest => SkipExpressionGo "," tail rest
2684+-- Open paren → enter nested expression
2686+ ( SkipNested tail rest1
2687+ , SkipExpression rest1 rest
2689+ SkipExpressionGo "(" tail rest
2690+-- Space → skip and continue (expressions can have spaces, e.g. "EXCLUDED.col")
2691+else instance (SkipSpaces tail rest1, SkipExpressionAfterSpace rest1 rest) => SkipExpressionGo " " tail rest
2692+-- End of string after this char
2693+else instance SkipExpressionGo h "" ""
2694+-- Regular char → continue
2695+else instance (Symbol.Cons h2 t2 tail, SkipExpressionGo h2 t2 rest) => SkipExpressionGo h tail rest
2697+-- | After a space in an expression, check if we've hit a comma or a new assignment (word = ...).
2698+-- | If the next word is a column name followed by '=', this is a new assignment, so stop.
2699+-- | Otherwise, continue the expression.
2700+class SkipExpressionAfterSpace :: Symbol -> Symbol -> Constraint
2701+class SkipExpressionAfterSpace sym rest | sym -> rest
2703+instance SkipExpressionAfterSpace "" ""
2705+ ( Symbol.Cons h t sym
2706+ , SkipExpressionAfterSpaceGo h t sym rest
2708+ SkipExpressionAfterSpace sym rest
2710+class SkipExpressionAfterSpaceGo :: Symbol -> Symbol -> Symbol -> Symbol -> Constraint
2711+class SkipExpressionAfterSpaceGo head tail sym rest | head tail sym -> rest
2714+instance Symbol.Cons "," tail rest => SkipExpressionAfterSpaceGo "," tail sym rest
2715+-- Otherwise continue the expression
2716+else instance (SkipExpressionGo h tail rest) => SkipExpressionAfterSpaceGo h tail sym rest
2718+-- | Skip a parenthesised group (after the opening paren has been consumed).
2719+-- | Handles nesting.
2720+class SkipNested :: Symbol -> Symbol -> Constraint
2721+class SkipNested sym rest | sym -> rest
2724+ ( Symbol.Cons h t sym
2725+ , SkipNestedGo h t rest
2727+ SkipNested sym rest
2729+class SkipNestedGo :: Symbol -> Symbol -> Symbol -> Constraint
2730+class SkipNestedGo head tail rest | head tail -> rest
2732+-- Close paren → done
2733+instance SkipNestedGo ")" tail tail
2734+-- Open paren → recurse
2735+else instance (SkipNested tail rest1, SkipNested rest1 rest) => SkipNestedGo "(" tail rest
2736+-- Any other char → continue
2737+else instance (SkipNested tail rest) => SkipNestedGo h tail rest
2322class ParseAssignmentsContinue :: Symbol -> Row Type -> Constraint
2739class ParseAssignmentsContinue :: Symbol -> Row Type -> Constraint
2323class ParseAssignmentsContinue sym cols
2740class ParseAssignmentsContinue sym cols
@@ -2381,6 +2798,7 @@ class IsAutoGeneratedTC constraints result | constraints -> result
2382instance IsAutoGeneratedTC (AutoIncrement a) True
2799instance IsAutoGeneratedTC (AutoIncrement a) True
2383else instance IsAutoGeneratedTC (Default s a) True
2800else instance IsAutoGeneratedTC (Default s a) True
2801+else instance IsAutoGeneratedTC (DefaultExpr expression a) True
2384else instance IsAutoGeneratedTC a result => IsAutoGeneratedTC (PrimaryKey a) result
2802else instance IsAutoGeneratedTC a result => IsAutoGeneratedTC (PrimaryKey a) result
2385else instance IsAutoGeneratedTC a result => IsAutoGeneratedTC (Unique a) result
2803else instance IsAutoGeneratedTC a result => IsAutoGeneratedTC (Unique a) result
2386else instance IsAutoGeneratedTC a result => IsAutoGeneratedTC (ForeignKey t r c a) result
2804else instance IsAutoGeneratedTC a result => IsAutoGeneratedTC (ForeignKey t r c a) result
@@ -2436,11 +2854,19 @@ class FieldToPGValue a where
2436 fieldToPGValue :: a -> PG.PGValue
2854 fieldToPGValue :: a -> PG.PGValue
2438instance FieldToPGValue a => FieldToPGValue (Maybe a) where
2856instance FieldToPGValue a => FieldToPGValue (Maybe a) where
2439− fieldToPGValue = toNullable >>> unsafeCoerce
2857+ fieldToPGValue = case _ of
2858+ Nothing -> unsafeCoerce (toNullable Nothing)
2859+ Just value -> fieldToPGValue value
2440else instance FieldToPGValue DateTime where
2860else instance FieldToPGValue DateTime where
2441 fieldToPGValue = JSDate.fromDateTime >>> unsafeCoerce
2861 fieldToPGValue = JSDate.fromDateTime >>> unsafeCoerce
2442−else instance FieldToPGValue a where
2862+else instance FieldToPGValue TimestampTZ where
2863+ fieldToPGValue (TimestampTZ dt) = JSDate.fromDateTime dt # unsafeCoerce
2864+else instance FieldToPGValue PGDate where
2865+ fieldToPGValue = writeImpl >>> unsafeCoerce
2866+else instance FieldToPGValue PGUUID where
2443 fieldToPGValue = unsafeCoerce
2867 fieldToPGValue = unsafeCoerce
2868+else instance WriteForeign a => FieldToPGValue a where
2869+ fieldToPGValue = writeImpl >>> unsafeCoerce
2445class RecordValuesRL :: RL.RowList Type -> Row Type -> Constraint
2871class RecordValuesRL :: RL.RowList Type -> Row Type -> Constraint
2446class RecordValuesRL rl row where
2872class RecordValuesRL rl row where
@@ -2508,6 +2934,20 @@ else instance HasAnyDMLRL (RL.Cons "delete" Unit rest)
2508else instance HasAnyDMLRL rest => HasAnyDMLRL (RL.Cons label typ rest)
2934else instance HasAnyDMLRL rest => HasAnyDMLRL (RL.Cons label typ rest)
2509else instance Fail (Text "WHERE requires a preceding SELECT, UPDATE (set), or DELETE") => HasAnyDMLRL RL.Nil
2935else instance Fail (Text "WHERE requires a preceding SELECT, UPDATE (set), or DELETE") => HasAnyDMLRL RL.Nil
2937+class HasMutation :: Row Type -> Constraint
2938+class HasMutation stage
2940+instance (RL.RowToList stage rl, HasMutationRL rl) => HasMutation stage
2942+class HasMutationRL :: RL.RowList Type -> Constraint
2943+class HasMutationRL rl
2945+instance HasMutationRL (RL.Cons "insert" Unit rest)
2946+else instance HasMutationRL (RL.Cons "set" Unit rest)
2947+else instance HasMutationRL (RL.Cons "delete" Unit rest)
2948+else instance HasMutationRL rest => HasMutationRL (RL.Cons label typ rest)
2949+else instance Fail (Text "RETURNING requires a preceding INSERT, UPDATE (set), or DELETE") => HasMutationRL RL.Nil
2511toSQL :: forall tables result params stage. Q tables result params stage -> String
2951toSQL :: forall tables result params stage. Q tables result params stage -> String
2512toSQL (Q q) = q.sql
2952toSQL (Q q) = q.sql
@@ -2517,6 +2957,12 @@ from _ = Q { sql: reflectSymbol (Proxy :: Proxy name), values: [] }
2517fromAs :: forall @alias name cols tables. IsSymbol name => IsSymbol alias => Row.Cons alias cols () tables => Proxy (Table name cols) -> Q tables () () ()
2957fromAs :: forall @alias name cols tables. IsSymbol name => IsSymbol alias => Row.Cons alias cols () tables => Proxy (Table name cols) -> Q tables () () ()
2518fromAs _ = Q { sql: reflectSymbol (Proxy :: Proxy name) <> " " <> reflectSymbol (Proxy :: Proxy alias), values: [] }
2958fromAs _ = Q { sql: reflectSymbol (Proxy :: Proxy name) <> " " <> reflectSymbol (Proxy :: Proxy alias), values: [] }
2960+into :: forall name cols tables. IsSymbol name => Row.Cons name cols () tables => Proxy (Table name cols) -> Q tables () () (into :: Unit)
2961+into _ = Q { sql: reflectSymbol (Proxy :: Proxy name), values: [] }
2963+update :: forall name cols tables. IsSymbol name => Row.Cons name cols () tables => Proxy (Table name cols) -> Q tables () () (update :: Unit)
2964+update _ = Q { sql: reflectSymbol (Proxy :: Proxy name), values: [] }
2520selectAll
2966selectAll
2521 :: forall tables name cols result r p stage stage'
2967 :: forall tables name cols result r p stage stage'
2522 . SingleTable tables name cols
2968 . SingleTable tables name cols
@@ -2524,6 +2970,7 @@ selectAll
2524 => StripColumns cols result
2970 => StripColumns cols result
2525 => Row.Lacks "select" stage
2971 => Row.Lacks "select" stage
2526 => Row.Lacks "insert" stage
2972 => Row.Lacks "insert" stage
2973+ => Row.Lacks "into" stage
2527 => Row.Lacks "set" stage
2974 => Row.Lacks "set" stage
2528 => Row.Lacks "delete" stage
2975 => Row.Lacks "delete" stage
2529 => Row.Lacks "where" stage
2976 => Row.Lacks "where" stage
@@ -2541,6 +2988,7 @@ select
2541 => ParseSelect sel tables result
2988 => ParseSelect sel tables result
2542 => Row.Lacks "select" stage
2989 => Row.Lacks "select" stage
2543 => Row.Lacks "insert" stage
2990 => Row.Lacks "insert" stage
2991+ => Row.Lacks "into" stage
2544 => Row.Lacks "set" stage
2992 => Row.Lacks "set" stage
2545 => Row.Lacks "delete" stage
2993 => Row.Lacks "delete" stage
2546 => Row.Lacks "where" stage
2994 => Row.Lacks "where" stage
@@ -2558,6 +3006,7 @@ selectDistinct
2558 => ParseSelect sel tables result
3006 => ParseSelect sel tables result
2559 => Row.Lacks "select" stage
3007 => Row.Lacks "select" stage
2560 => Row.Lacks "insert" stage
3008 => Row.Lacks "insert" stage
3009+ => Row.Lacks "into" stage
2561 => Row.Lacks "set" stage
3010 => Row.Lacks "set" stage
2562 => Row.Lacks "delete" stage
3011 => Row.Lacks "delete" stage
2563 => Row.Lacks "where" stage
3012 => Row.Lacks "where" stage
@@ -2578,6 +3027,7 @@ selectDistinctOn
2578 => ParseSelect sel tables result
3027 => ParseSelect sel tables result
2579 => Row.Lacks "select" stage
3028 => Row.Lacks "select" stage
2580 => Row.Lacks "insert" stage
3029 => Row.Lacks "insert" stage
3030+ => Row.Lacks "into" stage
2581 => Row.Lacks "set" stage
3031 => Row.Lacks "set" stage
2582 => Row.Lacks "delete" stage
3032 => Row.Lacks "delete" stage
2583 => Row.Lacks "where" stage
3033 => Row.Lacks "where" stage
@@ -2782,13 +3232,17 @@ insert rec _ = Q { sql, values }
2782 tableName = reflectSymbol (Proxy :: Proxy name)
3232 tableName = reflectSymbol (Proxy :: Proxy name)
2783 colNames = columnNamesRL (Proxy :: Proxy userRowRL)
3233 colNames = columnNamesRL (Proxy :: Proxy userRowRL)
2784 placeholders = colNames # mapWithIndex \i _ -> "$" <> show (i + 1)
3234 placeholders = colNames # mapWithIndex \i _ -> "$" <> show (i + 1)
3236+ if Array.null colNames then
2785− sql = "INSERT INTO " <> tableName
3237+ "INSERT INTO " <> tableName <> " DEFAULT VALUES"
3239+ "INSERT INTO " <> tableName
2786− <> " ("
3240+ <> " ("
2787− <> intercalate ", " colNames
3241+ <> intercalate ", " colNames
2789− <> " VALUES ("
3243+ <> " VALUES ("
2790− <> intercalate ", " placeholders
3244+ <> intercalate ", " placeholders
2792 values = recordValuesRL (Proxy :: Proxy userRowRL) rec
3246 values = recordValuesRL (Proxy :: Proxy userRowRL) rec
2794-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
3248-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -2800,6 +3254,7 @@ returning
2800 . SingleTable tables name cols
3254 . SingleTable tables name cols
2801 => IsSymbol sel
3255 => IsSymbol sel
2802 => ParseSelect sel tables result
3256 => ParseSelect sel tables result
3257+ => HasMutation stage
2803 => Row.Lacks "returning" stage
3258 => Row.Lacks "returning" stage
2804 => Row.Lacks "select" stage
3259 => Row.Lacks "select" stage
2805 => Row.Cons "returning" Unit stage stage'
3260 => Row.Cons "returning" Unit stage stage'
@@ -2811,6 +3266,7 @@ returningAll
2811 :: forall tables name cols result p stage stage'
3266 :: forall tables name cols result p stage stage'
2812 . SingleTable tables name cols
3267 . SingleTable tables name cols
2813 => StripColumns cols result
3268 => StripColumns cols result
3269+ => HasMutation stage
2814 => Row.Lacks "returning" stage
3270 => Row.Lacks "returning" stage
2815 => Row.Lacks "select" stage
3271 => Row.Lacks "select" stage
2816 => Row.Cons "returning" Unit stage stage'
3272 => Row.Cons "returning" Unit stage stage'
@@ -2853,8 +3309,10 @@ set
2853 => ValidateSetColumnsRL setRL cols
3309 => ValidateSetColumnsRL setRL cols
2854 => SetClauseRL setRL
3310 => SetClauseRL setRL
2855 => RecordValuesRL setRL setRow
3311 => RecordValuesRL setRL setRow
3312+ => HasClause "update" stage
2856 => Row.Lacks "select" stage
3313 => Row.Lacks "select" stage
2857 => Row.Lacks "insert" stage
3314 => Row.Lacks "insert" stage
3315+ => Row.Lacks "into" stage
2858 => Row.Lacks "set" stage
3316 => Row.Lacks "set" stage
2859 => Row.Lacks "delete" stage
3317 => Row.Lacks "delete" stage
2860 => Row.Cons "set" Unit stage stage'
3318 => Row.Cons "set" Unit stage stage'
@@ -2878,6 +3336,7 @@ delete
2878 => IsSymbol name
3336 => IsSymbol name
2879 => Row.Lacks "select" stage
3337 => Row.Lacks "select" stage
2880 => Row.Lacks "insert" stage
3338 => Row.Lacks "insert" stage
3339+ => Row.Lacks "into" stage
2881 => Row.Lacks "set" stage
3340 => Row.Lacks "set" stage
2882 => Row.Lacks "delete" stage
3341 => Row.Lacks "delete" stage
2883 => Row.Cons "delete" Unit stage stage'
3342 => Row.Cons "delete" Unit stage stage'
@@ -3118,6 +3577,66 @@ exceptAll
3118 -> Q tables1 result params SetOpStage
3577 -> Q tables1 result params SetOpStage
3119exceptAll (Q q1) (Q q2) = Q { sql: "(" <> q1.sql <> ") EXCEPT ALL (" <> q2.sql <> ")", values: q1.values <> q2.values }
3578exceptAll (Q q1) (Q q2) = Q { sql: "(" <> q1.sql <> ") EXCEPT ALL (" <> q2.sql <> ")", values: q1.values <> q2.values }
3580+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
3581+-- CTE (WITH clause) support
3582+-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
3584+newtype WithCTEs :: Row (Row Type) -> Row Type -> Type
3585+newtype WithCTEs cteTables cteParams = WithCTEs
3586+ { sql :: String, values :: Array PG.PGValue }
3588+-- Wrap a complete SELECT query as a named CTE
3590+ :: forall @name tables result params stage cteTables
3592+ => HasClause "select" stage
3593+ => Row.Cons name result () cteTables
3594+ => Q tables result params stage
3595+ -> WithCTEs cteTables params
3596+cte (Q q) = WithCTEs
3597+ { sql: reflectSymbol (Proxy :: Proxy name) <> " AS (" <> q.sql <> ")"
3601+-- Add another named CTE to an accumulator
3603+ :: forall @name tables result params stage cteTables cteParams cteTables' cteParams'
3605+ => HasClause "select" stage
3606+ => Row.Lacks name cteTables
3607+ => Row.Cons name result cteTables cteTables'
3608+ => Row.Union cteParams params cteParams'
3609+ => Row.Nub cteParams' cteParams'
3610+ => Q tables result params stage
3611+ -> WithCTEs cteTables cteParams
3612+ -> WithCTEs cteTables' cteParams'
3613+andCTE (Q q) (WithCTEs w) = WithCTEs
3614+ { sql: w.sql <> ", " <> reflectSymbol (Proxy :: Proxy name) <> " AS (" <> q.sql <> ")"
3615+ , values: w.values <> q.values
3618+-- Start main query FROM a named CTE; cteTables becomes available as tables
3620+ :: forall @name result restTables cteTables cteParams
3622+ => Row.Cons name result restTables cteTables
3623+ => WithCTEs cteTables cteParams
3624+ -> Q cteTables () () ()
3625+fromCTE _ = Q { sql: reflectSymbol (Proxy :: Proxy name), values: [] }
3627+-- Finalize: prepend WITH clause and merge params
3629+ :: forall cteTables cteParams mainParams allParams result stage
3630+ . Row.Union cteParams mainParams allParams
3631+ => Row.Nub allParams allParams
3632+ => WithCTEs cteTables cteParams
3633+ -> Q cteTables result mainParams stage
3634+ -> Q cteTables result allParams stage
3635+with_ (WithCTEs w) (Q q) = Q
3636+ { sql: "WITH " <> w.sql <> " " <> q.sql
3637+ , values: w.values <> q.values
3121-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
3640-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
3122-- Query execution
3641-- Query execution
3123-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
3642-- ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -3133,28 +3652,34 @@ instance
3133 ( IsSymbol name
3652 ( IsSymbol name
3134 , Row.Cons name typ rest row
3653 , Row.Cons name typ rest row
3135 , Row.Lacks name rest
3654 , Row.Lacks name rest
3655+ , FieldToPGValue typ
3136 , ParamsToArray tail row
3656 , ParamsToArray tail row
3138 ParamsToArray (RL.Cons name typ tail) row where
3658 ParamsToArray (RL.Cons name typ tail) row where
3139 paramsToArray _ rec =
3659 paramsToArray _ rec =
3140 [ { name: reflectSymbol (Proxy :: Proxy name)
3660 [ { name: reflectSymbol (Proxy :: Proxy name)
3141− , value: unsafeToForeign (Record.get (Proxy :: Proxy name) rec)
3661+ , value: unsafeCoerce (fieldToPGValue (Record.get (Proxy :: Proxy name) rec))
3144 <> paramsToArray (Proxy :: Proxy tail) rec
3664 <> paramsToArray (Proxy :: Proxy tail) rec
3146namedParamRegex :: Regex.Regex
3666namedParamRegex :: Regex.Regex
3147−namedParamRegex = case Regex.regex "\\$[a-zA-Z_][a-zA-Z0-9_]*" Regex.global of
3667+namedParamRegex = case Regex.regex "\\$[a-zA-Z_][a-zA-Z0-9_]*(::[a-zA-Z_]+)?" Regex.global of
3148 Right r -> r
3668 Right r -> r
3149 Left _ -> unsafeCoerce unit
3669 Left _ -> unsafeCoerce unit
3671+stripCast :: String -> String
3672+stripCast s = case SCU.indexOf (Pattern "::") s of
3674+ Just i -> SCU.take i s
3151replaceNamedParams :: Int -> Array { name :: String, value :: Foreign } -> String -> { sql :: String, values :: Array PG.PGValue }
3676replaceNamedParams :: Int -> Array { name :: String, value :: Foreign } -> String -> { sql :: String, values :: Array PG.PGValue }
3152replaceNamedParams offset entries sql = do
3677replaceNamedParams offset entries sql = do
3153 let indexed = entries # mapWithIndex \i e -> { idx: offset + i + 1, name: e.name, value: e.value }
3678 let indexed = entries # mapWithIndex \i e -> { idx: offset + i + 1, name: e.name, value: e.value }
3154 let replacements = indexed # foldl (\m e -> Map.insert ("$" <> e.name) ("$" <> show e.idx) m) Map.empty
3679 let replacements = indexed # foldl (\m e -> Map.insert ("$" <> e.name) ("$" <> show e.idx) m) Map.empty
3156 sql' = Regex.replace' namedParamRegex
3681 sql' = Regex.replace' namedParamRegex
3157− ( \match _ -> case Map.lookup match replacements of
3682+ ( \match _ -> case Map.lookup (stripCast match) replacements of
3158 Nothing -> match
3683 Nothing -> match
3159 Just v -> v
3684 Just v -> v
@@ -3175,7 +3700,9 @@ runQuery conn params (Q q) = do
3175 let { sql, values } = replaceNamedParams (Array.length q.values) entries q.sql
3700 let { sql, values } = replaceNamedParams (Array.length q.values) entries q.sql
3176 let allValues = q.values <> values
3701 let allValues = q.values <> values
3177 result <- PG.query (PG.SQL sql) allValues conn
3702 result <- PG.query (PG.SQL sql) allValues conn
3178− pure (unsafeDecodeRows result.rows)
3703+ case decodeRows result.rows of
3704+ Left errs -> throwError (Exception.error ("Row decode failed: " <> show errs))
3705+ Right rows -> pure rows
3180runQueryOne
3707runQueryOne
3181 :: forall tables result params paramsRL stage
3708 :: forall tables result params paramsRL stage
@@ -3191,7 +3718,11 @@ runQueryOne conn params (Q q) = do
3191 let { sql, values } = replaceNamedParams (Array.length q.values) entries q.sql
3718 let { sql, values } = replaceNamedParams (Array.length q.values) entries q.sql
3192 let allValues = q.values <> values
3719 let allValues = q.values <> values
3193 result <- PG.queryOne (PG.SQL sql) allValues conn
3720 result <- PG.queryOne (PG.SQL sql) allValues conn
3194− pure (result <#> unsafeDecodeRow)
3721+ case result of
3722+ Nothing -> pure Nothing
3723+ Just row -> case decodeRow row of
3724+ Left errs -> throwError (Exception.error ("Row decode failed: " <> show errs))
3725+ Right a -> pure (Just a)
3196runExecute
3727runExecute
3197 :: forall tables params paramsRL stage
3728 :: forall tables params paramsRL stage
@@ -3223,7 +3754,9 @@ runQueryTx txn params (Q q) = do
3223 let { sql, values } = replaceNamedParams (Array.length q.values) entries q.sql
3754 let { sql, values } = replaceNamedParams (Array.length q.values) entries q.sql
3224 let allValues = q.values <> values
3755 let allValues = q.values <> values
3225 result <- PG.txQuery (PG.SQL sql) allValues txn
3756 result <- PG.txQuery (PG.SQL sql) allValues txn
3226− pure (unsafeDecodeRows result.rows)
3757+ case decodeRows result.rows of
3758+ Left errs -> throwError (Exception.error ("Row decode failed: " <> show errs))
3759+ Right rows -> pure rows
3228runExecuteTx
3761runExecuteTx
3229 :: forall tables params paramsRL stage
3762 :: forall tables params paramsRL stage
@@ -3239,10 +3772,9 @@ runExecuteTx txn params (Q q) = do
3239 let allValues = q.values <> values
3772 let allValues = q.values <> values
3240 PG.txExecute (PG.SQL sql) allValues txn
3773 PG.txExecute (PG.SQL sql) allValues txn
3242−unsafeDecodeRows :: forall a. ReadForeign a => Array Foreign -> Array a
3243−unsafeDecodeRows = map unsafeDecodeRow
3245−unsafeDecodeRow :: forall a. ReadForeign a => Foreign -> a
3776+decodeRows :: forall a. ReadForeign a => Array Foreign -> Either (NonEmptyList ForeignError) (Array a)
3246−unsafeDecodeRow f = case runExcept (readImpl f) of
3777+decodeRows = traverse (readImpl >>> runExcept)
3247− Left _ -> unsafeCoerce unit
3778+
3248− Right a -> a
3779+decodeRow :: forall a. ReadForeign a => Foreign -> Either (NonEmptyList ForeignError) a
3780+decodeRow = readImpl >>> runExcept