a9248b1 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Remove the RawResult type

commita9248b1b28cbf6f032fce97f359ebdd8bc1adc0d authorLeon P Smith <leon@melding-monads.com> dateFri 4 May 2012, 17:08 (14 years ago) parent8ea1c2f

2 files changed+2−7

unifiedsplit

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

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

4141

4242#include "MachDeps.h"

4343

44−import Control.Applicative

44+import Control.Applicative

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

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

4747import Data.Attoparsec.Char8 hiding (Result)

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

5858import Data.Typeable (Typeable, typeOf)

5959import Data.Word (Word64)

6060import Database.PostgreSQL.Simple.Internal

61−import Database.PostgreSQL.Simple.BuiltinTypes

61+import Database.PostgreSQL.Simple.BuiltinTypes

6262-- import qualified Database.PostgreSQ

6363import Database.PostgreSQL.Simple.Ok

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

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

297297 case parseOnly p s of

298298 Left err -> returnError ConversionFailed f err

299299 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

228228 connectionObjects <- newMVar IntMap.empty

229229 return Connection{..}

230230

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

232−

233231data Row = Row {

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

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