git.iko.soy/typeable/postgresql-simple
on master help sign in
Fix boolean rendering, and some code cleanups
3ecf655Leon P Smith
src/Database/PostgreSQL/Simple/Param.hs+2−1
compare with master
unifiedsplit
@@ -104,7 +104,8 @@ instance Param Null where
104 {-# INLINE render #-}
104 {-# INLINE render #-}
105
105
106instance Param Bool where
106instance Param Bool where
107− render = Plain . integral . fromEnum
107+ render True = Plain (fromByteString "true")
108+ render False = Plain (fromByteString "false")
108 {-# INLINE render #-}
109 {-# INLINE render #-}
109
110
110instance Param Int8 where
111instance Param Int8 where
src/Database/PostgreSQL/Simple/Result.hs+4−8
@@ -44,8 +44,7 @@ import Data.Time.Clock (UTCTime)
44import Data.Time.Format (parseTime)
44import Data.Time.Format (parseTime)
45import Data.Time.LocalTime (TimeOfDay, makeTimeOfDayValid)
45import Data.Time.LocalTime (TimeOfDay, makeTimeOfDayValid)
46import Data.Typeable (TypeRep, Typeable, typeOf)
46import Data.Typeable (TypeRep, Typeable, typeOf)
47−import Data.Word ({- Word, Word8, Word16, Word32, -} Word64)
47+import Data.Word (Word64)
48−-- import Database.MySQL.Base.Types (Field(..), Type(..))
49import Database.PostgreSQL.Simple.Internal
48import Database.PostgreSQL.Simple.Internal
50import Database.PostgreSQL.Simple.Field (Field(..), RawResult(..))
49import Database.PostgreSQL.Simple.Field (Field(..), RawResult(..))
51import Database.PostgreSQL.Simple.BuiltinTypes
50import Database.PostgreSQL.Simple.BuiltinTypes
@@ -200,12 +199,9 @@ mkCompat = Compat . shiftL 1 . fromEnum
200
199
201compat :: Compat -> Compat -> Bool
200compat :: Compat -> Compat -> Bool
202compat (Compat a) (Compat b) = a .&. b /= 0
201compat (Compat a) (Compat b) = a .&. b /= 0
203−{--
202+
204−okText, ok8, ok16, ok32, ok64, okWord :: Compat
203+okText, ok16, ok32, ok64 :: Compat
205−--}
206okText = mkCompats [Name,Text,Char,Bpchar,Varchar]
204okText = mkCompats [Name,Text,Char,Bpchar,Varchar]
207−{--}
208−--ok8 = mkCompats [Tiny]
209ok16 = mkCompats [Int2]
205ok16 = mkCompats [Int2]
210ok32 = mkCompats [Int2,Int4]
206ok32 = mkCompats [Int2,Int4]
211ok64 = mkCompats [Int2,Int4,Int8]
207ok64 = mkCompats [Int2,Int4,Int8]
@@ -214,7 +210,7 @@ okInt = ok32
214#else
210#else
215okInt = ok64
211okInt = ok64
216#endif
212#endif
217−--}
213+
218doConvert :: forall a . (Typeable a)
214doConvert :: forall a . (Typeable a)
219 => Field -> Compat -> (ByteString -> Either SomeException a)
215 => Field -> Compat -> (ByteString -> Either SomeException a)
220 -> Maybe ByteString -> Either SomeException a
216 -> Maybe ByteString -> Either SomeException a