a9248b1 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

on master help sign in

Remove the RawResult type

a9248b1Leon P Smith14 years ago

src/Database/PostgreSQL/Simple/FromField.hs+2−5

@@ -41,7 +41,7 @@ module Database.PostgreSQL.Simple.FromField

42#include "MachDeps.h"

44−import Control.Applicative

44+import Control.Applicative

45 ( Applicative, (<|>), (<$>), (<*>), (<*), pure )

46import Control.Exception (SomeException(..), Exception)

47import Data.Attoparsec.Char8 hiding (Result)

@@ -58,7 +58,7 @@ import Data.Time.LocalTime (TimeOfDay, makeTimeOfDayValid)

58import Data.Typeable (Typeable, typeOf)

59import Data.Word (Word64)

60import Database.PostgreSQL.Simple.Internal

61−import Database.PostgreSQL.Simple.BuiltinTypes

61+import Database.PostgreSQL.Simple.BuiltinTypes

62-- import qualified Database.PostgreSQ

63import Database.PostgreSQL.Simple.Ok

64import Database.PostgreSQL.Simple.Types (Binary(..), Null(..))

@@ -297,6 +297,3 @@ atto' types p0 f dat = doFromField f types (go p0) dat

297 case parseOnly p s of

298 Left err -> returnError ConversionFailed f err

299 Right v -> v

300−

301−instance FromField RawResult where

302− fromField field rawData = pure (RawResult field rawData)

src/Database/PostgreSQL/Simple/Internal.hs−2

@@ -228,8 +228,6 @@ newNullConnection = do

228 connectionObjects <- newMVar IntMap.empty

229 return Connection{..}

230

231−data RawResult = RawResult { rawField :: Field, rawData :: Maybe ByteString }

232−

233data Row = Row {

231data Row = Row {

234 row :: {-# UNPACK #-} !PQ.Row

232 row :: {-# UNPACK #-} !PQ.Row

235 , typenames :: !(V.Vector ByteString)

233 , typenames :: !(V.Vector ByteString)