git.iko.soy/squeal
on dev help sign in
AllZip
32b2836Eitan Chatav
squeel-postgresql/exe/Example.hs+21−20
compare with dev
unifiedsplit
@@ -9,9 +9,9 @@
9module Main (main) where
9module Main (main) where
10
10
11import Control.Category ((>>>))
11import Control.Category ((>>>))
12−import Control.Monad.Base
12+-- import Control.Monad.Base
13import Data.Function ((&))
13import Data.Function ((&))
14−import Data.Int
14+-- import Data.Int
15import Data.Monoid
15import Data.Monoid
16import Generics.SOP
16import Generics.SOP
17import Squeel.PostgreSQL
17import Squeel.PostgreSQL
@@ -40,26 +40,27 @@ main = do
40 insertInto #table1 ( 1 `As` #col1 :* 2 `As` #col2 :* Nil )
40 insertInto #table1 ( 1 `As` #col1 :* 2 `As` #col2 :* Nil )
41 >>>
41 >>>
42 insertInto #table1 ( 3 `As` #col1 :* 4 `As` #col2 :* Nil )
42 insertInto #table1 ( 3 `As` #col1 :* 4 `As` #col2 :* Nil )
43− Just selectTable1Result <- flip pqExecParams Nil $
43+ -- Just selectTable1Result <- flip pqExecParams Nil $
44− (select $ starFrom #table1 :: Statement '[] Columns Tables Tables)
44+ -- (select $ starFrom #table1 :: Statement '[] Columns Tables Tables)
45− Just (Right value00) <- getvalue selectTable1Result (RowNumber 0) colNum0
45+ -- Just (Right value00) <- getvalue selectTable1Result (RowNumber 0) colNum0
46− Just (Right value01) <- getvalue selectTable1Result (RowNumber 0) colNum1
46+ -- Just (Right value01) <- getvalue selectTable1Result (RowNumber 0) colNum1
47− Just (Right value10) <- getvalue selectTable1Result (RowNumber 1) colNum0
47+ -- Just (Right value10) <- getvalue selectTable1Result (RowNumber 1) colNum0
48− Just (Right value11) <- getvalue selectTable1Result (RowNumber 1) colNum1
48+ -- Just (Right value11) <- getvalue selectTable1Result (RowNumber 1) colNum1
49− liftBase $ do
49+ -- liftBase $ do
50− print (value00 :: Int32)
50+ -- print (value00 :: Int32)
51− print (value01 :: Int32)
51+ -- print (value01 :: Int32)
52− print (value10 :: Int32)
52+ -- print (value10 :: Int32)
53− print (value11 :: Int32)
53+ -- print (value11 :: Int32)
54+ return ()
54 finish connection2
55 finish connection2
55−
56+--
56−type Columns =
57+-- type Columns =
57− '[ "col1" ::: 'Required ('NotNull 'PGInt4)
58+-- '[ "col1" ::: 'Required ('NotNull 'PGInt4)
58− , "col2" ::: 'Required ('NotNull 'PGInt4)
59+-- , "col2" ::: 'Required ('NotNull 'PGInt4)
59− ]
60+-- ]
60-- type SumAndCol1 = '[ "sum" ::: 'NotNull 'PGInt4, "col1" ::: 'NotNull 'PGInt4]
61-- type SumAndCol1 = '[ "sum" ::: 'NotNull 'PGInt4, "col1" ::: 'NotNull 'PGInt4]
61−type StudentsColumns = '["name" ::: 'Required ('NotNull 'PGText)]
62+-- type StudentsColumns = '["name" ::: 'Required ('NotNull 'PGText)]
62−type Tables = '[ "table1" ::: Columns, "students" ::: StudentsColumns]
63+-- type Tables = '[ "table1" ::: Columns, "students" ::: StudentsColumns]
63-- type OrderColumns =
64-- type OrderColumns =
64-- [ "orderID" ::: 'NotNull 'PGInt4
65-- [ "orderID" ::: 'NotNull 'PGInt4
65-- , "orderVal" ::: 'NotNull 'PGText
66-- , "orderVal" ::: 'NotNull 'PGText
squeel-postgresql/src/Squeel/PostgreSQL/Binary.hs+166−132
@@ -18,13 +18,13 @@ import Data.Aeson (FromJSON, ToJSON, eitherDecodeStrict, encode)
18import Data.ByteString (ByteString)
18import Data.ByteString (ByteString)
19import Data.Int (Int16,Int32,Int64)
19import Data.Int (Int16,Int32,Int64)
20import Generics.SOP
20import Generics.SOP
21−import GHC.Generics
21+-- import GHC.Generics
22−import PostgreSQL.Binary.Decoding (Value)
22+-- import PostgreSQL.Binary.Decoding
23import Data.Scientific (Scientific)
23import Data.Scientific (Scientific)
24import Data.Text (Text)
24import Data.Text (Text)
25import Data.Time (Day, TimeOfDay, TimeZone, LocalTime, UTCTime, DiffTime)
25import Data.Time (Day, TimeOfDay, TimeZone, LocalTime, UTCTime, DiffTime)
26import Data.UUID (UUID)
26import Data.UUID (UUID)
27−import GHC.Exts
27+-- import GHC.Exts
28
28
29import qualified Data.ByteString.Lazy as Lazy (ByteString, toStrict)
29import qualified Data.ByteString.Lazy as Lazy (ByteString, toStrict)
30import qualified Data.Text as Text (pack)
30import qualified Data.Text as Text (pack)
@@ -34,140 +34,174 @@ import qualified PostgreSQL.Binary.Encoding as Encoder
34
34
35import Squeel.PostgreSQL.Schema
35import Squeel.PostgreSQL.Schema
36
36
37−decodeValue :: FromValue pg x => Proxy# pg -> ByteString -> Either Text x
37+decodeValue :: HasDecoding pg x => proxy pg -> ByteString -> Either Text x
38−decodeValue p = Decoder.valueParser $ fromValue p
38+decodeValue p = Decoder.valueParser $ decoding p
39
39
40−class FromValue pg x where
40+class HasDecoding pg x where
41− fromValue :: Proxy# pg -> Value x
41+ decoding :: proxy pg -> Decoder.Value x
42−instance FromValue 'PGInt2 Int16 where
42+instance HasDecoding 'PGInt2 Int16 where
43− fromValue _ = Decoder.int
43+ decoding _ = Decoder.int
44−instance FromValue 'PGInt4 Int32 where
44+instance HasDecoding 'PGInt4 Int32 where
45− fromValue _ = Decoder.int
45+ decoding _ = Decoder.int
46−instance FromValue 'PGInt8 Int64 where
46+instance HasDecoding 'PGInt8 Int64 where
47− fromValue _ = Decoder.int
47+ decoding _ = Decoder.int
48−instance FromValue 'PGFloat4 Float where
48+instance HasDecoding 'PGFloat4 Float where
49− fromValue _ = Decoder.float4
49+ decoding _ = Decoder.float4
50−instance FromValue 'PGFloat8 Double where
50+instance HasDecoding 'PGFloat8 Double where
51− fromValue _ = Decoder.float8
51+ decoding _ = Decoder.float8
52−instance FromValue 'PGBool Bool where
52+instance HasDecoding 'PGBool Bool where
53− fromValue _ = Decoder.bool
53+ decoding _ = Decoder.bool
54−instance FromValue 'PGBytea ByteString where
54+instance HasDecoding 'PGBytea ByteString where
55− fromValue _ = Decoder.bytea_strict
55+ decoding _ = Decoder.bytea_strict
56−instance FromValue 'PGBytea Lazy.ByteString where
56+instance HasDecoding 'PGBytea Lazy.ByteString where
57− fromValue _ = Decoder.bytea_lazy
57+ decoding _ = Decoder.bytea_lazy
58−instance FromValue 'PGText Text where
58+instance HasDecoding 'PGText Text where
59− fromValue _ = Decoder.text_strict
59+ decoding _ = Decoder.text_strict
60−instance FromValue 'PGText Lazy.Text where
60+instance HasDecoding 'PGText Lazy.Text where
61− fromValue _ = Decoder.text_lazy
61+ decoding _ = Decoder.text_lazy
62−instance FromValue ('PGChar 1) Char where
62+instance HasDecoding ('PGChar 1) Char where
63− fromValue _ = Decoder.char
63+ decoding _ = Decoder.char
64−instance FromValue 'PGNumeric Scientific where
64+instance HasDecoding 'PGNumeric Scientific where
65− fromValue _ = Decoder.numeric
65+ decoding _ = Decoder.numeric
66−instance FromValue 'PGUuid UUID where
66+instance HasDecoding 'PGUuid UUID where
67− fromValue _ = Decoder.uuid
67+ decoding _ = Decoder.uuid
68−instance FromJSON x => FromValue 'PGJson x where
68+instance FromJSON x => HasDecoding 'PGJson x where
69− fromValue _ = Decoder.json_bytes (left Text.pack . eitherDecodeStrict)
69+ decoding _ = Decoder.json_bytes (left Text.pack . eitherDecodeStrict)
70−instance FromJSON x => FromValue 'PGJsonb x where
70+instance FromJSON x => HasDecoding 'PGJsonb x where
71− fromValue _ = Decoder.jsonb_bytes (left Text.pack . eitherDecodeStrict)
71+ decoding _ = Decoder.jsonb_bytes (left Text.pack . eitherDecodeStrict)
72−instance FromValue 'PGDate Day where
72+instance HasDecoding 'PGDate Day where
73− fromValue _ = Decoder.date
73+ decoding _ = Decoder.date
74−instance FromValue 'PGTime TimeOfDay where
74+instance HasDecoding 'PGTime TimeOfDay where
75− fromValue _ = Decoder.time_int
75+ decoding _ = Decoder.time_int
76−instance FromValue 'PGTimeTZ (TimeOfDay, TimeZone) where
76+instance HasDecoding 'PGTimeTZ (TimeOfDay, TimeZone) where
77− fromValue _ = Decoder.timetz_int
77+ decoding _ = Decoder.timetz_int
78−instance FromValue 'PGTimestamp LocalTime where
78+instance HasDecoding 'PGTimestamp LocalTime where
79− fromValue _ = Decoder.timestamp_int
79+ decoding _ = Decoder.timestamp_int
80−instance FromValue 'PGTimestampTZ UTCTime where
80+instance HasDecoding 'PGTimestampTZ UTCTime where
81− fromValue _ = Decoder.timestamptz_int
81+ decoding _ = Decoder.timestamptz_int
82−instance FromValue 'PGInterval DiffTime where
82+instance HasDecoding 'PGInterval DiffTime where
83− fromValue _ = Decoder.interval_int
83+ decoding _ = Decoder.interval_int
84−instance FromValue pg ty => FromValue (column ::: 'Required ('NotNull pg)) ty where
85− fromValue _ = fromValue (proxy# :: Proxy# pg)
86
84
87−class FromValues pgs xs where
85+{-
88− decodeValues :: Proxy# pgs -> NP (K ByteString) xs -> NP (Either Text) xs
86+encodings
89−instance FromValues '[] '[] where decodeValues _ _ = Nil
87+ :: AllZip HasEncoding xs pgs
90−instance (FromValue pg x, FromValues pgs xs)
88+ => proxy pgs
91− => FromValues (pg ': pgs) (x ': xs) where
89+ -> NP I xs
92− decodeValues _ (K result :* results) =
90+ -> [ByteString]
93− decodeValue (proxy# :: Proxy# pg) result
91+encodings _ Nil = []
94− :* decodeValues (proxy# :: Proxy# pgs) results
92+encodings (_ :: proxy pgs) (I x :* xs) =
93+ case (hpure Proxy :: NP Proxy pgs) of
94+ proxy :* proxies -> undefined (encoding proxy x) : encodings proxies xs
95+-}
96+
97+decodings
98+ :: AllZip HasDecoding pgs xs
99+ => proxy pgs
100+ -> NP (K ByteString) xs -> Either Text (NP I xs)
101+decodings _ Nil = return Nil
102+decodings (_ :: proxy pgs) (K bytestring :* bytestrings) =
103+ case (hpure Proxy :: NP Proxy pgs) of
104+ proxy :* proxies -> (:*)
105+ <$> (I <$> Decoder.valueParser (decoding proxy) bytestring)
106+ <*> decodings proxies bytestrings
107+-- instance HasDecoding pg ty => HasDecoding (column ::: 'Required ('NotNull pg)) ty where
108+-- decoding _ = decoding (proxy# :: Proxy# pg)
95
109
96−class ToValue x pg where
110+-- class HasDecodings pgs xs where
97− toValue :: Proxy# pg -> x -> Encoder.Encoding
111+-- decodeValues :: Proxy# pgs -> NP (K ByteString) xs -> NP (Either Text) xs
98−instance ToValue Int16 'PGInt2 where
112+-- instance HasDecodings '[] '[] where decodeValues _ _ = Nil
99− toValue _ = Encoder.int2_int16
113+-- instance (HasDecoding pg x, HasDecodings pgs xs)
100−instance ToValue Int32 'PGInt4 where
114+-- => HasDecodings (pg ': pgs) (x ': xs) where
101− toValue _ = Encoder.int4_int32
115+-- decodeValues _ (K result :* results) =
102−instance ToValue Int64 'PGInt8 where
116+-- decodeValue (proxy# :: Proxy# pg) result
103− toValue _ = Encoder.int8_int64
117+-- :* decodeValues (proxy# :: Proxy# pgs) results
104−instance ToValue Float 'PGFloat4 where
105− toValue _ = Encoder.float4
106−instance ToValue Double 'PGFloat8 where
107− toValue _ = Encoder.float8
108−instance ToValue Bool 'PGBool where
109− toValue _ = Encoder.bool
110−instance ToValue ByteString 'PGBytea where
111− toValue _ = Encoder.bytea_strict
112−instance ToValue Lazy.ByteString 'PGBytea where
113− toValue _ = Encoder.bytea_lazy
114−instance ToValue Text 'PGText where
115− toValue _ = Encoder.text_strict
116−instance ToValue Lazy.Text 'PGText where
117− toValue _ = Encoder.text_lazy
118−instance ToValue Char ('PGChar 1) where
119− toValue _ = Encoder.char_utf8
120−instance ToValue Scientific 'PGNumeric where
121− toValue _ = Encoder.numeric
122−instance ToValue UUID 'PGUuid where
123− toValue _ = Encoder.uuid
124−instance ToJSON x => ToValue x 'PGJson where
125− toValue _ = Encoder.json_bytes . Lazy.toStrict . encode
126−instance ToJSON x => ToValue x 'PGJsonb where
127− toValue _ = Encoder.jsonb_bytes . Lazy.toStrict . encode
128−instance ToValue Day 'PGDate where
129− toValue _ = Encoder.date
130−instance ToValue TimeOfDay 'PGTime where
131− toValue _ = Encoder.time_int
132−instance ToValue (TimeOfDay, TimeZone) 'PGTimeTZ where
133− toValue _ = Encoder.timetz_int
134−instance ToValue LocalTime 'PGTimestamp where
135− toValue _ = Encoder.timestamp_int
136−instance ToValue UTCTime 'PGTimestampTZ where
137− toValue _ = Encoder.timestamptz_int
138−instance ToValue DiffTime 'PGInterval where
139− toValue _ = Encoder.interval_int
140
118
141−class ToValues xs pgs where
119+class HasEncoding x pg where
142− toValues :: Proxy# pgs -> NP I xs -> [ByteString]
120+ encoding :: proxy pg -> x -> Encoder.Encoding
143−instance ToValues '[] '[] where toValues _ _ = []
121+instance HasEncoding Int16 'PGInt2 where
144−instance (ToValue x pg, ToValues xs pgs)
122+ encoding _ = Encoder.int2_int16
145− => ToValues (x ': xs) (pg ': pgs) where
123+instance HasEncoding Int32 'PGInt4 where
146− toValues _ (I x :* xs)
124+ encoding _ = Encoder.int4_int32
147− = Encoder.encodingBytes ((toValue (proxy# :: Proxy# pg)) x)
125+instance HasEncoding Int64 'PGInt8 where
148− : toValues (proxy# :: Proxy# pgs) xs
126+ encoding _ = Encoder.int8_int64
127+instance HasEncoding Float 'PGFloat4 where
128+ encoding _ = Encoder.float4
129+instance HasEncoding Double 'PGFloat8 where
130+ encoding _ = Encoder.float8
131+instance HasEncoding Bool 'PGBool where
132+ encoding _ = Encoder.bool
133+instance HasEncoding ByteString 'PGBytea where
134+ encoding _ = Encoder.bytea_strict
135+instance HasEncoding Lazy.ByteString 'PGBytea where
136+ encoding _ = Encoder.bytea_lazy
137+instance HasEncoding Text 'PGText where
138+ encoding _ = Encoder.text_strict
139+instance HasEncoding Lazy.Text 'PGText where
140+ encoding _ = Encoder.text_lazy
141+instance HasEncoding Char ('PGChar 1) where
142+ encoding _ = Encoder.char_utf8
143+instance HasEncoding Scientific 'PGNumeric where
144+ encoding _ = Encoder.numeric
145+instance HasEncoding UUID 'PGUuid where
146+ encoding _ = Encoder.uuid
147+instance ToJSON x => HasEncoding x 'PGJson where
148+ encoding _ = Encoder.json_bytes . Lazy.toStrict . encode
149+instance ToJSON x => HasEncoding x 'PGJsonb where
150+ encoding _ = Encoder.jsonb_bytes . Lazy.toStrict . encode
151+instance HasEncoding Day 'PGDate where
152+ encoding _ = Encoder.date
153+instance HasEncoding TimeOfDay 'PGTime where
154+ encoding _ = Encoder.time_int
155+instance HasEncoding (TimeOfDay, TimeZone) 'PGTimeTZ where
156+ encoding _ = Encoder.timetz_int
157+instance HasEncoding LocalTime 'PGTimestamp where
158+ encoding _ = Encoder.timestamp_int
159+instance HasEncoding UTCTime 'PGTimestampTZ where
160+ encoding _ = Encoder.timestamptz_int
161+instance HasEncoding DiffTime 'PGInterval where
162+ encoding _ = Encoder.interval_int
149
163
150−newtype Encoding x = Encoding { unEncoding :: x -> Encoder.Encoding }
164+encodings
151−class ToEncoding pg x where toEncoding :: Proxy pg -> Encoding x
165+ :: AllZip HasEncoding xs pgs
166+ => proxy pgs
167+ -> NP I xs
168+ -> [ByteString]
169+encodings _ Nil = []
170+encodings (_ :: proxy pgs) (I x :* xs) =
171+ case (hpure Proxy :: NP Proxy pgs) of
172+ proxy :* proxies -> Encoder.encodingBytes (encoding proxy x)
173+ : encodings proxies xs
152
174
153−toEncodings
175+-- class HasEncodings xs pgs where
154− :: AllZip ToEncoding pgs xs
176+-- encodings :: Proxy# pgs -> NP I xs -> [ByteString]
155− => NP Proxy pgs
177+-- instance HasEncodings '[] '[] where encodings _ _ = []
156− -> NP Encoding xs
178+-- instance (HasEncoding x pg, HasEncodings xs pgs)
157−toEncodings = \case
179+-- => HasEncodings (x ': xs) (pg ': pgs) where
158− Nil -> Nil
180+-- encodings _ (I x :* xs)
159− proxy :* proxies -> toEncoding proxy :* toEncodings proxies
181+-- = Encoder.encodingBytes ((encoding (proxy# :: Proxy# pg)) x)
182+-- : encodings (proxy# :: Proxy# pgs) xs
160
183
161−encodeParameters' :: NP (Encoding :*: I) xs -> NP (K ByteString) xs
184+-- newtype Encoding x = Encoding { unEncoding :: x -> Encoder.Encoding }
162−encodeParameters' = \case
185+-- class ToEncoding pg x where toEncoding :: Proxy pg -> Encoding x
163− Nil -> Nil
164− (Encoding enc :*: I x) :* parameters ->
165− K (Encoder.encodingBytes (enc x)) :* encodeParameters' parameters
166
186
187+-- toEncodings
188+-- :: AllZip ToEncoding pgs xs
189+-- => NP Proxy pgs
190+-- -> NP Encoding xs
191+-- toEncodings = \case
192+-- Nil -> Nil
193+-- proxy :* proxies -> toEncoding proxy :* toEncodings proxies
194+--
167−encodeParameters
195+-- encodeParameters' :: NP (Encoding :*: I) xs -> NP (K ByteString) xs
196+-- encodeParameters' = \case
197+-- Nil -> Nil
198+-- (Encoding enc :*: I x) :* parameters ->
199+-- K (Encoder.encodingBytes (enc x)) :* encodeParameters' parameters
200+--
201+-- encodeParameters
168− :: AllZip ToEncoding pgs xs
202+-- :: AllZip ToEncoding pgs xs
169− => NP Proxy pgs
203+-- => NP Proxy pgs
170− -> NP I xs
204+-- -> NP I xs
171− -> NP (K ByteString) xs
205+-- -> NP (K ByteString) xs
172−encodeParameters proxies parameters = encodeParameters' $
206+-- encodeParameters proxies parameters = encodeParameters' $
173− hzipWith (:*:) (toEncodings proxies) parameters
207+-- hzipWith (:*:) (toEncodings proxies) parameters
squeel-postgresql/src/Squeel/PostgreSQL/PQ.hs+19−9
@@ -10,6 +10,7 @@
10 , MultiParamTypeClasses
10 , MultiParamTypeClasses
11 , RankNTypes
11 , RankNTypes
12 , ScopedTypeVariables
12 , ScopedTypeVariables
13+ , TypeApplications
13 , TypeFamilies
14 , TypeFamilies
14 , TypeOperators
15 , TypeOperators
15 , UndecidableInstances
16 , UndecidableInstances
@@ -22,6 +23,7 @@ import Control.Monad.Base
22import Control.Monad.Trans
23import Control.Monad.Trans
23import Control.Monad.Trans.Control
24import Control.Monad.Trans.Control
24import Data.ByteString (ByteString)
25import Data.ByteString (ByteString)
26+import Data.Proxy (Proxy)
25import Data.Text (Text)
27import Data.Text (Text)
26import Generics.SOP
28import Generics.SOP
27import GHC.Exts
29import GHC.Exts
@@ -69,7 +71,7 @@ class MonadPQ pq where
69 -> pq db0 db1 io (Maybe (Result '[]))
71 -> pq db0 db1 io (Maybe (Result '[]))
70
72
71 pqExecParams
73 pqExecParams
72− :: (MonadBase IO io, ToOids ps, ToValues xs ps)
74+ :: (MonadBase IO io, ToOids ps, AllZip HasEncoding xs ps, All Top ps)
73 => Statement ps ys db0 db1
75 => Statement ps ys db0 db1
74 -> NP I xs
76 -> NP I xs
75 -> pq db0 db1 io (Maybe (Result ys))
77 -> pq db0 db1 io (Maybe (Result ys))
@@ -81,7 +83,7 @@ class MonadPQ pq where
81 -> pq db0 db1 io (Maybe (Result []), PreparedStatement ps xs db0 db1)
83 -> pq db0 db1 io (Maybe (Result []), PreparedStatement ps xs db0 db1)
82
84
83 pqExecPrepared
85 pqExecPrepared
84− :: (MonadBase IO io, ToValues xs ps)
86+ :: (MonadBase IO io, AllZip HasEncoding xs ps, All Top ps)
85 => PreparedStatement ps ys db0 db1
87 => PreparedStatement ps ys db0 db1
86 -> NP I xs
88 -> NP I xs
87 -> pq db0 db1 io (Maybe (Result ys))
89 -> pq db0 db1 io (Maybe (Result ys))
@@ -104,12 +106,11 @@ instance MonadPQ PQ where
104 pqExecParams (UnsafeStatement q :: Statement ps ys db0 db1) params =
106 pqExecParams (UnsafeStatement q :: Statement ps ys db0 db1) params =
105 PQ $ \ (Connection conn) -> do
107 PQ $ \ (Connection conn) -> do
106 let
108 let
109+ paramValues = encodings (Proxy :: Proxy ps) params
110+ oids = toOids (proxy# :: Proxy# ps)
107 params' =
111 params' =
108 [ Just (oid, param', LibPQ.Binary)
112 [ Just (oid, param', LibPQ.Binary)
109− | (oid, param') <-
113+ | (oid, param') <- zip oids paramValues
110− zip
111− (toOids (proxy# :: Proxy# ps))
112− (toValues (proxy# :: Proxy# ps) params)
113 ]
114 ]
114 result <- liftBase $ LibPQ.execParams conn q params' LibPQ.Binary
115 result <- liftBase $ LibPQ.execParams conn q params' LibPQ.Binary
115 return (Result <$> result, Connection conn)
116 return (Result <$> result, Connection conn)
@@ -126,9 +127,10 @@ instance MonadPQ PQ where
126 pqExecPrepared (q :: PreparedStatement ps ys db0 db1) params =
127 pqExecPrepared (q :: PreparedStatement ps ys db0 db1) params =
127 PQ $ \ (Connection conn) -> do
128 PQ $ \ (Connection conn) -> do
128 let
129 let
130+ paramValues = encodings (Proxy :: Proxy ps) params
129 params' =
131 params' =
130 [ Just (param', LibPQ.Binary)
132 [ Just (param', LibPQ.Binary)
131− | param' <- toValues (proxy# :: Proxy# ps) params
133+ | (param') <- paramValues
132 ]
134 ]
133 result <- liftBase $
135 result <- liftBase $
134 LibPQ.execPrepared conn (renderPreparedStatement q) params' LibPQ.Binary
136 LibPQ.execPrepared conn (renderPreparedStatement q) params' LibPQ.Binary
@@ -202,12 +204,20 @@ colNum3 = colNum (proxy# :: Proxy# 3)
202colNum4 :: ColumnNumber (c0:c1:c2:c3:c4:cs) c4
204colNum4 :: ColumnNumber (c0:c1:c2:c3:c4:cs) c4
203colNum4 = colNum (proxy# :: Proxy# 4)
205colNum4 = colNum (proxy# :: Proxy# 4)
204
206
207+newtype Value pgs m x = Value { runValue :: Result pgs -> m x }
208+
209+-- getValue
210+-- :: (HasDecoding pg x, MonadBase IO io)
211+-- => RowNumber
212+-- -> ColumnNumber pgs pg
213+-- -> Value pgs (ExceptT Text (MaybeT io)) x
214+
205getvalue
215getvalue
206− :: (FromValue x y, MonadBase IO io)
216+ :: (HasDecoding x y, MonadBase IO io)
207 => Result xs
217 => Result xs
208 -> RowNumber
218 -> RowNumber
209 -> ColumnNumber xs x
219 -> ColumnNumber xs x
210 -> io (Maybe (Either Text y))
220 -> io (Maybe (Either Text y))
211getvalue (Result result) (RowNumber r) (ColumnNumber c :: ColumnNumber xs x) =
221getvalue (Result result) (RowNumber r) (ColumnNumber c :: ColumnNumber xs x) =
212− liftBase $ fmap (fmap (decodeValue (proxy# :: Proxy# x)))
222+ liftBase $ fmap (fmap (decodeValue (Proxy :: Proxy x)))
213 (LibPQ.getvalue' result r c)
223 (LibPQ.getvalue' result r c)