@@ -1,8 +1,7 @@
1{-# LANGUAGE CPP, DeriveDataTypeable, DeriveFunctor #-}
1{-# LANGUAGE CPP, DeriveDataTypeable, DeriveFunctor #-}
2{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
2{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
3{-# LANGUAGE PatternGuards, ScopedTypeVariables #-}
3{-# LANGUAGE PatternGuards, ScopedTypeVariables #-}
4−{-# LANGUAGE RecordWildCards #-}
4+{-# LANGUAGE RecordWildCards, TemplateHaskell #-}
5−{-# LANGUAGE PolyKinds #-}
8Module: Database.PostgreSQL.Simple.FromField
7Module: Database.PostgreSQL.Simple.FromField
@@ -28,19 +27,9 @@ Note that the 'Float' and 'Double' instances use attoparsec's 'double'
28conversion routine, which sacrifices some accuracy for speed. If you
27conversion routine, which sacrifices some accuracy for speed. If you
29need accuracy, consider first converting data to a 'Scientific' or 'Rational'
28need accuracy, consider first converting data to a 'Scientific' or 'Rational'
30type, and then converting to a floating-point type. If you are defining
29type, and then converting to a floating-point type. If you are defining
31−your own 'Database.PostgreSQL.Simple.FromRow.FromRow' instances, this can be
30+your own 'ToRow' instances, this can be acheived simply by
33−@'fromRational' '<$>' 'Database.PostgreSQL.Simple.FromRow.field'@, although
34−this idiom is additionally compatible with PostgreSQL's @int8@ and @numeric@
31+@'fromRational' '<$>' 'field'@, although this idiom additionally compatible
35−types. If this is unacceptable, you may find
32+with PostgreSQL's @numeric@ type.
36−'Database.PostgreSQL.Simple.FromRow.fieldWith' useful.
38−Also note that while converting to a 'Double' through the 'Scientific' type
39−is likely somewhat faster than converting through the 'Rational' type,
40−the 'Scientific' type has no way to represent @NaN@ and @±Infinity@ values.
41−Thus, if you need precision conversion of regular floating point values
42−and the possibility of receiving these special values from the backend,
43−stick with 'Rational'.
45Because 'FromField' is a typeclass, one may provide conversions to
34Because 'FromField' is a typeclass, one may provide conversions to
46additional Haskell types without modifying postgresql-simple. This is
35additional Haskell types without modifying postgresql-simple. This is
@@ -106,28 +95,24 @@ module Database.PostgreSQL.Simple.FromField
106 , typeOid
95 , typeOid
107 , PQ.Oid(..)
96 , PQ.Oid(..)
108 , PQ.Format(..)
97 , PQ.Format(..)
109− , pgArrayFieldParser
113 , fromJSONField
99 , fromJSONField
114− , fromFieldJSONByteString
117#include "MachDeps.h"
102#include "MachDeps.h"
119−import Control.Applicative ( Const(Const), (<|>), (<$>), pure, (*>), (<*) )
104+import Control.Applicative
105+ ( Applicative, (<|>), (<$>), pure )
120import Control.Concurrent.MVar (MVar, newMVar)
106import Control.Concurrent.MVar (MVar, newMVar)
121−import Control.Exception (Exception (toException, fromException))
107+import Control.Exception (Exception)
122import qualified Data.Aeson as JSON
108import qualified Data.Aeson as JSON
123−import Data.Attoparsec.ByteString.Char8 hiding (Result)
109+import Data.Attoparsec.Char8 hiding (Result)
124import Data.ByteString (ByteString)
110import Data.ByteString (ByteString)
125import qualified Data.ByteString.Char8 as B
111import qualified Data.ByteString.Char8 as B
126−import Data.Functor.Identity (Identity(Identity))
127import Data.Int (Int16, Int32, Int64)
112import Data.Int (Int16, Int32, Int64)
128import Data.IORef (IORef, newIORef)
113import Data.IORef (IORef, newIORef)
129import Data.Ratio (Ratio)
114import Data.Ratio (Ratio)
130−import Data.Time.Compat ( UTCTime, ZonedTime, LocalTime, Day, TimeOfDay, CalendarDiffTime )
115+import Data.Time ( UTCTime, ZonedTime, LocalTime, Day, TimeOfDay )
131import Data.Typeable (Typeable, typeOf)
116import Data.Typeable (Typeable, typeOf)
132import Data.Vector (Vector)
117import Data.Vector (Vector)
133import Data.Vector.Mutable (IOVector)
118import Data.Vector.Mutable (IOVector)
@@ -138,6 +123,7 @@ import Database.PostgreSQL.Simple.Ok
138import Database.PostgreSQL.Simple.Types
123import Database.PostgreSQL.Simple.Types
139import Database.PostgreSQL.Simple.TypeInfo as TI
124import Database.PostgreSQL.Simple.TypeInfo as TI
140import qualified Database.PostgreSQL.Simple.TypeInfo.Static as TI
125import qualified Database.PostgreSQL.Simple.TypeInfo.Static as TI
126+import Database.PostgreSQL.Simple.TypeInfo.Macro as TI
141import Database.PostgreSQL.Simple.Time
127import Database.PostgreSQL.Simple.Time
142import Database.PostgreSQL.Simple.Arrays as Arrays
128import Database.PostgreSQL.Simple.Arrays as Arrays
143import qualified Database.PostgreSQL.LibPQ as PQ
129import qualified Database.PostgreSQL.LibPQ as PQ
@@ -147,14 +133,9 @@ import qualified Data.ByteString.Lazy as LB
147import qualified Data.Text as ST
133import qualified Data.Text as ST
148import qualified Data.Text.Encoding as ST
134import qualified Data.Text.Encoding as ST
149import qualified Data.Text.Lazy as LT
135import qualified Data.Text.Lazy as LT
150−import Data.CaseInsensitive (CI)
136+import Data.UUID (UUID)
151−import qualified Data.CaseInsensitive as CI
152−import Data.UUID.Types (UUID)
153−import qualified Data.UUID.Types as UUID
137+import qualified Data.UUID as UUID
154import Data.Scientific (Scientific)
138import Data.Scientific (Scientific)
155−import GHC.Real (infinity, notANumber)
157−import qualified Data.Aeson.Types as JSON
159-- | Exception thrown if conversion from a SQL value to a Haskell
140-- | Exception thrown if conversion from a SQL value to a Haskell
160-- value fails.
141-- value fails.
@@ -182,9 +163,7 @@ data ResultError = Incompatible { errSQLType :: String
182 -- between metadata and actual data in a row).
163 -- between metadata and actual data in a row).
183 deriving (Eq, Show, Typeable)
164 deriving (Eq, Show, Typeable)
185−instance Exception ResultError where
166+instance Exception ResultError
186− toException = postgresqlExceptionToException
187− fromException = postgresqlExceptionFromException
189left :: Exception a => a -> Conversion b
168left :: Exception a => a -> Conversion b
190left = conversionError
169left = conversionError
@@ -225,7 +204,7 @@ typename field = typname <$> typeInfo field
226typeInfo :: Field -> Conversion TypeInfo
205typeInfo :: Field -> Conversion TypeInfo
227typeInfo Field{..} = Conversion $ \conn -> do
206typeInfo Field{..} = Conversion $ \conn -> do
228− Ok <$> (getTypeInfo conn typeOid)
207+ Ok <$> (getTypeInfo conn =<< PQ.ftype result column)
230typeInfoByOid :: PQ.Oid -> Conversion TypeInfo
209typeInfoByOid :: PQ.Oid -> Conversion TypeInfo
231typeInfoByOid oid = Conversion $ \conn -> do
210typeInfoByOid oid = Conversion $ \conn -> do
@@ -250,11 +229,9 @@ tableOid Field{..} = toMaybeOid (unsafeDupablePerformIO (PQ.ftable result column
250 then Nothing
229 then Nothing
251 else Just x
230 else Just x
253−-- | If the column has a table associated with it, this returns the
232+-- | If the column has a table associated with it, this returns the number
254−-- number of the associated table column. Table columns have
233+-- off the associated table column. Numbering starts from 0. Analogous
255−-- nonzero numbers. Zero is returned if the specified column is not
256−-- a simple reference to a table column, or when using pre-3.0
257−-- protocol. Analogous to libpq's @PQftablecol@.
234+-- to libpq's @PQftablecol@.
259tableColumn :: Field -> Int
236tableColumn :: Field -> Int
260tableColumn Field{..} = fromCol (unsafeDupablePerformIO (PQ.ftablecol result column))
237tableColumn Field{..} = fromCol (unsafeDupablePerformIO (PQ.ftablecol result column))
@@ -270,33 +247,16 @@ format Field{..} = unsafeDupablePerformIO (PQ.fformat result column)
271instance FromField () where
248instance FromField () where
272 fromField f _bs
249 fromField f _bs
273− | typeOid f /= TI.voidOid = returnError Incompatible f ""
250+ | typeOid f /= $(inlineTypoid TI.void) = returnError Incompatible f ""
274 | otherwise = pure ()
251 | otherwise = pure ()
276−instance (FromField a) => FromField (Const a b) where
277− fromField f bs = Const <$> fromField f bs
279−instance (FromField a) => FromField (Identity a) where
280− fromField f bs = Identity <$> fromField f bs
282-- | For dealing with null values. Compatible with any postgresql type
253-- | For dealing with null values. Compatible with any postgresql type
283-- compatible with type @a@. Note that the type is not checked if
254-- compatible with type @a@. Note that the type is not checked if
284-- the value is null, although it is inadvisable to rely on this
255-- the value is null, although it is inadvisable to rely on this
285-- behavior.
256-- behavior.
286−instance FromField a => FromField (Maybe a) where
257+instance (FromField a) => FromField (Maybe a) where
287− fromField = optionalField fromField
289−-- | For dealing with SQL @null@ values outside of the 'FromField' class.
290−-- Alternatively, one could use 'Control.Applicative.optional', but that
291−-- also turns type and conversion errors into 'Nothing', whereas this is
292−-- more specific and turns only @null@ values into 'Nothing'.
294−optionalField :: FieldParser a -> FieldParser (Maybe a)
295−optionalField p f mv =
297− Nothing -> pure Nothing
258+ fromField _ Nothing = pure Nothing
298− Just _ -> Just <$> p f mv
259+ fromField f bs = Just <$> fromField f bs
299−{-# INLINE optionalField #-}
301-- | compatible with any data type, but the value must be null
261-- | compatible with any data type, but the value must be null
302instance FromField Null where
262instance FromField Null where
@@ -306,30 +266,30 @@ instance FromField Null where
307instance FromField Bool where
267instance FromField Bool where
308 fromField f bs
268 fromField f bs
309− | typeOid f /= TI.boolOid = returnError Incompatible f ""
269+ | typeOid f /= $(inlineTypoid TI.bool) = returnError Incompatible f ""
310 | bs == Nothing = returnError UnexpectedNull f ""
270 | bs == Nothing = returnError UnexpectedNull f ""
311 | bs == Just "t" = pure True
271 | bs == Just "t" = pure True
312 | bs == Just "f" = pure False
272 | bs == Just "f" = pure False
313 | otherwise = returnError ConversionFailed f ""
273 | otherwise = returnError ConversionFailed f ""
315−-- | \"char\", bpchar
275+-- | \"char\"
316instance FromField Char where
276instance FromField Char where
317− fromField f bs0 =
277+ fromField f bs =
318− if (eq TI.charOid \/ eq TI.bpcharOid) (typeOid f)
278+ if typeOid f /= $(inlineTypoid TI.char)
279+ then returnError Incompatible f ""
319− then case bs0 of
280+ else case bs of
320 Nothing -> returnError UnexpectedNull f ""
281 Nothing -> returnError UnexpectedNull f ""
321 Just bs -> if B.length bs /= 1
282 Just bs -> if B.length bs /= 1
322 then returnError ConversionFailed f "length not 1"
283 then returnError ConversionFailed f "length not 1"
323 else return $! (B.head bs)
284 else return $! (B.head bs)
324− else returnError Incompatible f ""
327instance FromField Int16 where
287instance FromField Int16 where
328− fromField = attoFieldParser ok16 $ signed decimal
288+ fromField = atto ok16 $ signed decimal
330-- | int2, int4
290-- | int2, int4
331instance FromField Int32 where
291instance FromField Int32 where
332− fromField = attoFieldParser ok32 $ signed decimal
292+ fromField = atto ok32 $ signed decimal
334#if WORD_SIZE_IN_BITS < 64
294#if WORD_SIZE_IN_BITS < 64
335-- | int2, int4, and if compiled as 64-bit code, int8 as well.
295-- | int2, int4, and if compiled as 64-bit code, int8 as well.
@@ -339,64 +299,50 @@ instance FromField Int32 where
339-- This library was compiled as 64-bit code.
299-- This library was compiled as 64-bit code.
341instance FromField Int where
301instance FromField Int where
342− fromField = attoFieldParser okInt $ signed decimal
302+ fromField = atto okInt $ signed decimal
344-- | int2, int4, int8
304-- | int2, int4, int8
345instance FromField Int64 where
305instance FromField Int64 where
346− fromField = attoFieldParser ok64 $ signed decimal
306+ fromField = atto ok64 $ signed decimal
348-- | int2, int4, int8
308-- | int2, int4, int8
349instance FromField Integer where
309instance FromField Integer where
350− fromField = attoFieldParser ok64 $ signed decimal
310+ fromField = atto ok64 $ signed decimal
352-- | int2, float4 (Uses attoparsec's 'double' routine, for
312-- | int2, float4 (Uses attoparsec's 'double' routine, for
353-- better accuracy convert to 'Scientific' or 'Rational' first)
313-- better accuracy convert to 'Scientific' or 'Rational' first)
354instance FromField Float where
314instance FromField Float where
355− fromField = attoFieldParser ok (realToFrac <$> pg_double)
315+ fromField = atto ok (realToFrac <$> double)
356− where ok = eq TI.float4Oid \/ eq TI.int2Oid
316+ where ok = $(mkCompats [TI.float4,TI.int2])
358-- | int2, int4, float4, float8 (Uses attoparsec's 'double' routine, for
318-- | int2, int4, float4, float8 (Uses attoparsec's 'double' routine, for
359-- better accuracy convert to 'Scientific' or 'Rational' first)
319-- better accuracy convert to 'Scientific' or 'Rational' first)
360instance FromField Double where
320instance FromField Double where
361− fromField = attoFieldParser ok pg_double
321+ fromField = atto ok double
362− where ok = eq TI.float4Oid \/ eq TI.float8Oid \/ eq TI.int2Oid \/ eq TI.int4Oid
322+ where ok = $(mkCompats [TI.float4,TI.float8,TI.int2,TI.int4])
364−-- | int2, int4, int8, float4, float8, numeric
324+-- | int2, int4, float4, float8, numeric
365instance FromField (Ratio Integer) where
325instance FromField (Ratio Integer) where
366− fromField = attoFieldParser ok pg_rational
326+ fromField = atto ok rational
367− where ok = eq TI.float4Oid \/ eq TI.float8Oid \/ eq TI.int2Oid \/ eq TI.int4Oid \/ eq TI.int8Oid \/ eq TI.numericOid
327+ where ok = $(mkCompats [TI.float4,TI.float8,TI.int2,TI.int4,TI.numeric])
369−-- | int2, int4, int8, float4, float8, numeric
329+-- | int2, int4, float4, float8, numeric
370instance FromField Scientific where
330instance FromField Scientific where
371− fromField = attoFieldParser ok rational
331+ fromField = atto ok rational
372− where ok = eq TI.float4Oid \/ eq TI.float8Oid \/ eq TI.int2Oid \/ eq TI.int4Oid \/ eq TI.int8Oid \/ eq TI.numericOid
332+ where ok = $(mkCompats [TI.float4,TI.float8,TI.int2,TI.int4,TI.numeric])
374unBinary :: Binary t -> t
334unBinary :: Binary t -> t
375unBinary (Binary x) = x
335unBinary (Binary x) = x
377−pg_double :: Parser Double
379− = (string "NaN" *> pure ( 0 / 0))
380− <|> (string "Infinity" *> pure ( 1 / 0))
381− <|> (string "-Infinity" *> pure (-1 / 0))
384−pg_rational :: Parser Rational
386− = (string "NaN" *> pure notANumber )
387− <|> (string "Infinity" *> pure infinity )
388− <|> (string "-Infinity" *> pure (-infinity))
391-- | bytea, name, text, \"char\", bpchar, varchar, unknown
337-- | bytea, name, text, \"char\", bpchar, varchar, unknown
392instance FromField SB.ByteString where
338instance FromField SB.ByteString where
393− fromField f dat = if typeOid f == TI.byteaOid
339+ fromField f dat = if typeOid f == $(inlineTypoid TI.bytea)
394 then unBinary <$> fromField f dat
340 then unBinary <$> fromField f dat
395 else doFromField f okText' pure dat
341 else doFromField f okText' pure dat
398instance FromField PQ.Oid where
344instance FromField PQ.Oid where
399− fromField f dat = PQ.Oid <$> attoFieldParser (== TI.oidOid) decimal f dat
345+ fromField f dat = PQ.Oid <$> atto (== $(inlineTypoid TI.oid)) decimal f dat
401-- | bytea, name, text, \"char\", bpchar, varchar, unknown
347-- | bytea, name, text, \"char\", bpchar, varchar, unknown
402instance FromField LB.ByteString where
348instance FromField LB.ByteString where
@@ -404,7 +350,7 @@ instance FromField LB.ByteString where
405unescapeBytea :: Field -> SB.ByteString
351unescapeBytea :: Field -> SB.ByteString
406 -> Conversion (Binary SB.ByteString)
352 -> Conversion (Binary SB.ByteString)
407−unescapeBytea f str' = case unsafeDupablePerformIO (PQ.unescapeBytea str') of
353+unescapeBytea f str = case unsafeDupablePerformIO (PQ.unescapeBytea str) of
408 Nothing -> returnError ConversionFailed f "unescapeBytea failed"
354 Nothing -> returnError ConversionFailed f "unescapeBytea failed"
409 Just str -> pure (Binary str)
355 Just str -> pure (Binary str)
@@ -427,85 +373,54 @@ instance FromField ST.Text where
427instance FromField LT.Text where
373instance FromField LT.Text where
428 fromField f dat = LT.fromStrict <$> fromField f dat
374 fromField f dat = LT.fromStrict <$> fromField f dat
431−instance FromField (CI ST.Text) where
432− fromField f mdat = do
435− then returnError Incompatible f ""
437− Nothing -> returnError UnexpectedNull f ""
438− Just dat -> either left (pure . CI.mk)
439− (ST.decodeUtf8' dat)
442−instance FromField (CI LT.Text) where
443− fromField f mdat = do
446− then returnError Incompatible f ""
448− Nothing -> returnError UnexpectedNull f ""
449− Just dat -> either left (pure . CI.mk . LT.fromStrict)
450− (ST.decodeUtf8' dat)
452-- | name, text, \"char\", bpchar, varchar
376-- | name, text, \"char\", bpchar, varchar
453instance FromField [Char] where
377instance FromField [Char] where
454 fromField f dat = ST.unpack <$> fromField f dat
378 fromField f dat = ST.unpack <$> fromField f dat
456-- | timestamptz
380-- | timestamptz
457instance FromField UTCTime where
381instance FromField UTCTime where
458− fromField = ff TI.timestamptzOid "UTCTime" parseUTCTime
382+ fromField = ff $(inlineTypoid TI.timestamptz) "UTCTime" parseUTCTime
460-- | timestamptz
384-- | timestamptz
461instance FromField ZonedTime where
385instance FromField ZonedTime where
462− fromField = ff TI.timestamptzOid "ZonedTime" parseZonedTime
386+ fromField = ff $(inlineTypoid TI.timestamptz) "ZonedTime" parseZonedTime
464-- | timestamp
388-- | timestamp
465instance FromField LocalTime where
389instance FromField LocalTime where
466− fromField = ff TI.timestampOid "LocalTime" parseLocalTime
390+ fromField = ff $(inlineTypoid TI.timestamp) "LocalTime" parseLocalTime
469instance FromField Day where
393instance FromField Day where
470− fromField = ff TI.dateOid "Day" parseDay
394+ fromField = ff $(inlineTypoid TI.date) "Day" parseDay
473instance FromField TimeOfDay where
397instance FromField TimeOfDay where
474− fromField = ff TI.timeOid "TimeOfDay" parseTimeOfDay
398+ fromField = ff $(inlineTypoid TI.time) "TimeOfDay" parseTimeOfDay
476-- | timestamptz
400-- | timestamptz
477instance FromField UTCTimestamp where
401instance FromField UTCTimestamp where
478− fromField = ff TI.timestamptzOid "UTCTimestamp" parseUTCTimestamp
402+ fromField = ff $(inlineTypoid TI.timestamptz) "UTCTimestamp" parseUTCTimestamp
480-- | timestamptz
404-- | timestamptz
481instance FromField ZonedTimestamp where
405instance FromField ZonedTimestamp where
482− fromField = ff TI.timestamptzOid "ZonedTimestamp" parseZonedTimestamp
406+ fromField = ff $(inlineTypoid TI.timestamptz) "ZonedTimestamp" parseZonedTimestamp
484-- | timestamp
408-- | timestamp
485instance FromField LocalTimestamp where
409instance FromField LocalTimestamp where
486− fromField = ff TI.timestampOid "LocalTimestamp" parseLocalTimestamp
410+ fromField = ff $(inlineTypoid TI.timestamp) "LocalTimestamp" parseLocalTimestamp
489instance FromField Date where
413instance FromField Date where
490− fromField = ff TI.dateOid "Date" parseDate
414+ fromField = ff $(inlineTypoid TI.date) "Date" parseDate
492−-- | interval. Requires you to configure intervalstyle as @iso_8601@.
494−-- You can configure intervalstyle on every connection with a @SET@ command,
495−-- but for better performance you may want to configure it permanently in the
496−-- file found with @SHOW config_file;@ .
498−instance FromField CalendarDiffTime where
499− fromField = ff TI.intervalOid "CalendarDiffTime" parseCalendarDiffTime
501ff :: PQ.Oid -> String -> (B8.ByteString -> Either String a)
416ff :: PQ.Oid -> String -> (B8.ByteString -> Either String a)
502 -> Field -> Maybe B8.ByteString -> Conversion a
417 -> Field -> Maybe B8.ByteString -> Conversion a
503−ff compatOid hsType parseBS f mstr =
418+ff compatOid hsType parse f mstr =
504 if typeOid f /= compatOid
419 if typeOid f /= compatOid
505 then err Incompatible ""
420 then err Incompatible ""
506 else case mstr of
421 else case mstr of
507 Nothing -> err UnexpectedNull ""
422 Nothing -> err UnexpectedNull ""
508− Just str -> case parseBS str of
423+ Just str -> case parse str of
509 Left msg -> err ConversionFailed msg
424 Left msg -> err ConversionFailed msg
510 Right val -> return val
425 Right val -> return val
@@ -527,29 +442,27 @@ instance (FromField a, FromField b) => FromField (Either a b) where
528-- | any postgresql array whose elements are compatible with type @a@
443-- | any postgresql array whose elements are compatible with type @a@
529instance (FromField a, Typeable a) => FromField (PGArray a) where
444instance (FromField a, Typeable a) => FromField (PGArray a) where
530− fromField = pgArrayFieldParser fromField
445+ fromField f mdat = do
532−pgArrayFieldParser :: Typeable a => FieldParser a -> FieldParser (PGArray a)
533−pgArrayFieldParser fieldParser f mdat = do
534 info <- typeInfo f
446 info <- typeInfo f
535 case info of
447 case info of
536 TI.Array{} ->
448 TI.Array{} ->
537 case mdat of
449 case mdat of
538 Nothing -> returnError UnexpectedNull f ""
450 Nothing -> returnError UnexpectedNull f ""
539 Just dat -> do
451 Just dat -> do
540− case parseOnly (fromArray fieldParser info f) dat of
452+ case parseOnly (fromArray info f) dat of
541 Left err -> returnError ConversionFailed f err
453 Left err -> returnError ConversionFailed f err
542 Right conv -> PGArray <$> conv
454 Right conv -> PGArray <$> conv
543 _ -> returnError Incompatible f ""
455 _ -> returnError Incompatible f ""
457+fromArray :: (FromField a)
545−fromArray :: FieldParser a -> TypeInfo -> Field -> Parser (Conversion [a])
458+ => TypeInfo -> Field -> Parser (Conversion [a])
546−fromArray fieldParser typInfo f = sequence . (parseIt <$>) <$> array delim
459+fromArray typeInfo f = sequence . (parseIt <$>) <$> array delim
548− delim = typdelim (typelem typInfo)
461+ delim = typdelim (typelem typeInfo)
549− fElem = f{ typeOid = typoid (typelem typInfo) }
462+ fElem = f{ typeOid = typoid (typelem typeInfo) }
551 parseIt item =
464 parseIt item =
552− fieldParser f' $ if item == Arrays.Plain "NULL" then Nothing else Just item'
465+ fromField f' $ if item' == "NULL" then Nothing else Just item'
554 item' = fmt delim item
467 item' = fmt delim item
555 f' | Arrays.Array _ <- item = f
468 f' | Arrays.Array _ <- item = f
@@ -564,7 +477,7 @@ instance (FromField a, Typeable a) => FromField (IOVector a) where
565instance FromField UUID where
478instance FromField UUID where
566 fromField f mbs =
479 fromField f mbs =
567− if typeOid f /= TI.uuidOid
480+ if typeOid f /= $(inlineTypoid TI.uuid)
568 then returnError Incompatible f ""
481 then returnError Incompatible f ""
569 else case mbs of
482 else case mbs of
570 Nothing -> returnError UnexpectedNull f ""
483 Nothing -> returnError UnexpectedNull f ""
@@ -573,26 +486,26 @@ instance FromField UUID where
573 Nothing -> returnError ConversionFailed f "Invalid UUID"
486 Nothing -> returnError ConversionFailed f "Invalid UUID"
574 Just uuid -> pure uuid
487 Just uuid -> pure uuid
576−-- | json, jsonb
489+-- | json
577instance FromField JSON.Value where
490instance FromField JSON.Value where
578− fromField f mbs = parseBS =<< fromFieldJSONByteString f mbs
491+ fromField f mbs =
579− where parseBS bs = case JSON.eitherDecodeStrict' bs of
492+ if typeOid f /= $(inlineTypoid TI.json)
580− Left err -> returnError ConversionFailed f err
581− Right val -> pure val
583−-- | Return the JSON ByteString directly
586−fromFieldJSONByteString :: Field -> Maybe ByteString -> Conversion ByteString
587−fromFieldJSONByteString f mbs =
588− if typeOid f /= TI.jsonOid && typeOid f /= TI.jsonbOid
589 then returnError Incompatible f ""
493 then returnError Incompatible f ""
590 else case mbs of
494 else case mbs of
591 Nothing -> returnError UnexpectedNull f ""
495 Nothing -> returnError UnexpectedNull f ""
592− Just bs -> pure bs
496+ Just bs ->
497+#if MIN_VERSION_aeson(0,6,3)
498+ case JSON.eitherDecodeStrict' bs of
499+#elif MIN_VERSION_bytestring(0,10,0)
500+ case JSON.eitherDecode' $ LB.fromStrict bs of
502+ case JSON.eitherDecode' $ LB.fromChunks [bs] of
504+ Left err -> returnError ConversionFailed f err
505+ Right val -> pure val
594-- | Parse a field to a JSON 'JSON.Value' and convert that into a
507-- | Parse a field to a JSON 'JSON.Value' and convert that into a
595−-- Haskell value using the 'JSON.FromJSON' instance.
508+-- Haskell value using 'JSON.fromJSON'.
597-- This can be used as the default implementation for the 'fromField'
510-- This can be used as the default implementation for the 'fromField'
598-- method for Haskell types that have a JSON representation in
511-- method for Haskell types that have a JSON representation in
@@ -600,23 +513,14 @@ fromFieldJSONByteString f mbs =
601-- The 'Typeable' constraint is required to show more informative
514-- The 'Typeable' constraint is required to show more informative
602-- error messages when parsing fails.
515-- error messages when parsing fails.
604−-- Note that @fromJSONField :: FieldParser ('Maybe' Foo)@ will return
605−-- @'Nothing'@ on the json @null@ value, and return an exception on SQL @null@
606−-- value. Alternatively, one could write @'optionalField' fromJSONField@
607−-- that will return @Nothing@ on SQL @null@, and otherwise will call
608−-- @fromJSONField :: FieldParser Foo@ and then return @'Just'@ the
609−-- result value, or return its exception. If one would
610−-- like to return @Nothing@ on both the SQL @null@ and json @null@ values,
611−-- one way to do it would be to write
612−-- @\\f mv -> 'Control.Monad.join' '<$>' optionalField fromJSONField f mv@
613fromJSONField :: (JSON.FromJSON a, Typeable a) => FieldParser a
516fromJSONField :: (JSON.FromJSON a, Typeable a) => FieldParser a
614fromJSONField f mbBs = do
517fromJSONField f mbBs = do
615 value <- fromField f mbBs
518 value <- fromField f mbBs
616− case JSON.ifromJSON value of
519+ case JSON.fromJSON value of
617− JSON.IError path err -> returnError ConversionFailed f $
520+ JSON.Error err -> returnError ConversionFailed f $
618− "JSON decoding error: " ++ (JSON.formatError path err)
521+ "JSON decoding error: " ++ err
619− JSON.ISuccess x -> pure x
522+ JSON.Success x -> pure x
621-- | Compatible with the same set of types as @a@. Note that
525-- | Compatible with the same set of types as @a@. Note that
622-- modifying the 'IORef' does not have any effects outside
526-- modifying the 'IORef' does not have any effects outside
@@ -633,33 +537,20 @@ instance FromField a => FromField (MVar a) where
633type Compat = PQ.Oid -> Bool
537type Compat = PQ.Oid -> Bool
635okText, okText', okBinary, ok16, ok32, ok64, okInt :: Compat
539okText, okText', okBinary, ok16, ok32, ok64, okInt :: Compat
636−okText = eq TI.nameOid \/ eq TI.textOid \/ eq TI.charOid
540+okText = $( mkCompats [ TI.name, TI.text, TI.char,
637− \/ eq TI.bpcharOid \/ eq TI.varcharOid
541+ TI.bpchar, TI.varchar ] )
638−okText' = eq TI.nameOid \/ eq TI.textOid \/ eq TI.charOid
542+okText' = $( mkCompats [ TI.name, TI.text, TI.char,
639− \/ eq TI.bpcharOid \/ eq TI.varcharOid \/ eq TI.unknownOid
543+ TI.bpchar, TI.varchar, TI.unknown ] )
640−okBinary = eq TI.byteaOid
544+okBinary = (== $( inlineTypoid TI.bytea ))
641−ok16 = eq TI.int2Oid
545+ok16 = (== $( inlineTypoid TI.int2 ))
642−ok32 = eq TI.int2Oid \/ eq TI.int4Oid
546+ok32 = $( mkCompats [TI.int2,TI.int4] )
643−ok64 = eq TI.int2Oid \/ eq TI.int4Oid \/ eq TI.int8Oid
547+ok64 = $( mkCompats [TI.int2,TI.int4,TI.int8] )
644#if WORD_SIZE_IN_BITS < 64
548#if WORD_SIZE_IN_BITS < 64
645okInt = ok32
549okInt = ok32
647okInt = ok64
551okInt = ok64
650−-- | eq and \/ are used to imlement what Macro stuff did,
651−-- i.e. mkCompats and inlineTypoid
652−eq :: PQ.Oid -> PQ.Oid -> Bool
657−(\/) :: (PQ.Oid -> Bool)
660−f \/ g = \x -> f x || g x
663doFromField :: forall a . (Typeable a)
554doFromField :: forall a . (Typeable a)
664 => Field -> Compat -> (ByteString -> Conversion a)
555 => Field -> Compat -> (ByteString -> Conversion a)
665 -> Maybe ByteString -> Conversion a
556 -> Maybe ByteString -> Conversion a
@@ -684,22 +575,10 @@ returnError mkErr f msg = do
684 (show (typeOf (undefined :: a)))
575 (show (typeOf (undefined :: a)))
687−-- | Construct a field parser from an attoparsec parser. An 'Incompatible' error is thrown if the
688−-- PostgreSQL oid does not match the specified predicate.
691−-- instance FromField Int16 where
692−-- fromField = attoFieldParser ok16 (signed decimal)
696−attoFieldParser :: forall a. (Typeable a)
578+atto :: forall a. (Typeable a)
697− => (PQ.Oid -> Bool)
579+ => Compat -> Parser a -> Field -> Maybe ByteString
698− -- ^ Predicate for whether the postgresql type oid is compatible with this parser
580+ -> Conversion a
700− -- ^ An attoparsec parser.
702−attoFieldParser types p0 f dat = doFromField f types (go p0) dat
581+atto types p0 f dat = doFromField f types (go p0) dat
704 go :: Parser a -> ByteString -> Conversion a
583 go :: Parser a -> ByteString -> Conversion a