4e1b449 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Refactor getTypeInfo to use new Char instance

4e1b449Leon P Smith14 years ago

src/Database/PostgreSQL/Simple/FromField.hs-boot+1

@@ -6,5 +6,6 @@ import Database.PostgreSQL.Simple.Types

6class FromField a

8instance FromField Oid

9+instance FromField Char

9instance FromField ByteString

10instance FromField ByteString

10instance FromField a => FromField (Maybe a)

11instance FromField a => FromField (Maybe a)

src/Database/PostgreSQL/Simple/TypeInfo.hs+1−4

@@ -27,7 +27,6 @@ module Database.PostgreSQL.Simple.TypeInfo

27 , TypeInfo(..)

28 ) where

30−import qualified Data.ByteString.Char8 as B8

31import qualified Data.IntMap as IntMap

30import qualified Data.IntMap as IntMap

32import Control.Concurrent.MVar

31import Control.Concurrent.MVar

33import Control.Exception (throw)

32import Control.Exception (throw)

@@ -64,9 +63,7 @@ getTypeInfo' conn oid oidmap =

64 (oidmap', typeInfo) <-

63 (oidmap', typeInfo) <-

65 case names of

64 case names of

66 [] -> return $ throw (fatalError "invalid type oid")

65 [] -> return $ throw (fatalError "invalid type oid")

67− [(typoid, typcategory_, typdelim_, typname, typelem_)] -> do

66+ [(typoid, typcategory, typdelim, typname, typelem_)] -> do

68− let !typcategory = B8.index typcategory_ 0

69− !typdelim = B8.index typdelim_ 0

70 case typcategory of

67 case typcategory of

71 'A' -> do

68 'A' -> do

72 (oidmap', typelem) <- getTypeInfo' conn typelem_ oidmap

69 (oidmap', typelem) <- getTypeInfo' conn typelem_ oidmap