b58cbb1 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Tweak `getTypename` to use the newer oid2typname function

b58cbb1Leon P Smith14 years ago

src/Database/PostgreSQL/Simple.hs+3−4

@@ -126,8 +126,7 @@ import qualified Data.IntMap as IntMap

126import Data.List (intersperse)

127import Data.Monoid (mappend, mconcat)

128import Data.Typeable (Typeable)

129−import Database.PostgreSQL.Simple.BuiltinTypes

129+import Database.PostgreSQL.Simple.BuiltinTypes ( oid2typname )

130− ( oid2builtin, builtin2typname )

131import Database.PostgreSQL.Simple.Compat ( mask )

130import Database.PostgreSQL.Simple.Compat ( mask )

132import Database.PostgreSQL.Simple.FromField (ResultError(..))

131import Database.PostgreSQL.Simple.FromField (ResultError(..))

133import Database.PostgreSQL.Simple.FromRow (FromRow(..))

132import Database.PostgreSQL.Simple.FromRow (FromRow(..))

@@ -934,8 +933,8 @@ fmtError msg q xs = throw FormatError {

934

933

935getTypename :: Connection -> PQ.Oid -> IO ByteString

934getTypename :: Connection -> PQ.Oid -> IO ByteString

936getTypename conn@Connection{..} oid =

935getTypename conn@Connection{..} oid =

937− case oid2builtin oid of

936+ case oid2typname oid of

938− Just builtin -> return $! builtin2typname builtin

937+ Just name -> return name

939 Nothing -> modifyMVar connectionObjects $ \oidmap -> do

938 Nothing -> modifyMVar connectionObjects $ \oidmap -> do

940 case IntMap.lookup (oid2int oid) oidmap of

939 case IntMap.lookup (oid2int oid) oidmap of

941 Just name -> return (oidmap, name)

940 Just name -> return (oidmap, name)