@@ -102,7 +102,6 @@ import Data.Typeable (Typeable, typeOf)
102import Data.Vector (Vector)
102import Data.Vector (Vector)
103import qualified Data.Vector as V
103import qualified Data.Vector as V
104import Database.PostgreSQL.Simple.Internal
104import Database.PostgreSQL.Simple.Internal
105−-- import Database.PostgreSQL.Simple.BuiltinTypes
106import Database.PostgreSQL.Simple.Compat
105import Database.PostgreSQL.Simple.Compat
107import Database.PostgreSQL.Simple.Ok
106import Database.PostgreSQL.Simple.Ok
108import Database.PostgreSQL.Simple.Types (Binary(..), Null(..))
107import Database.PostgreSQL.Simple.Types (Binary(..), Null(..))
@@ -434,22 +433,10 @@ fromArray typeInfo f = sequence . (parseIt <$>) <$> array delim
435type Compat = PQ.Oid -> Bool
434type Compat = PQ.Oid -> Bool
438−mkCompats :: [BuiltinType] -> Compat
439−mkCompats = foldl' f (Compat 0) . map mkCompat
440− where f (Compat a) (Compat b) = Compat (a .|. b)
442−mkCompat :: BuiltinType -> Compat
443−mkCompat = Compat . shiftL 1 . fromEnum
445−compat :: Compat -> Compat -> Bool
446−compat (Compat a) (Compat b) = a .&. b /= 0
449okText, okText', okBinary, ok16, ok32, ok64, okInt :: Compat
436okText, okText', okBinary, ok16, ok32, ok64, okInt :: Compat
450okText = $( mkCompats [ TI.name, TI.text, TI.char,
437okText = $( mkCompats [ TI.name, TI.text, TI.char,
451 TI.bpchar, TI.varchar ] )
438 TI.bpchar, TI.varchar ] )
452−okText' = $( mkCompats [ TI.name, TI.text, TI.char,
439+okText' = $( mkCompats [ TI.name, TI.text, TI.char,
453 TI.bpchar, TI.varchar, TI.unknown ] )
440 TI.bpchar, TI.varchar, TI.unknown ] )
454okBinary = $( mkCompat TI.bytea )
441okBinary = $( mkCompat TI.bytea )
455ok16 = $( mkCompat TI.int2 )
442ok16 = $( mkCompat TI.int2 )