edcb018 · typeable/postgresql-simple

git.iko.soy/typeable/postgresql-simple

Use vector instead.

commitedcb01860e041c2cdd1865a3fa2ac53a65e8fe4b authorJason Dusek <jason.dusek@gmail.com> dateThu 16 Aug 2012, 16:11 (14 years ago) parentaf0201e

2 files changed+8−8

compare with master

unifiedsplit

src/Database/PostgreSQL/Simple/FromField.hs+4−4 src/Database/PostgreSQL/Simple/ToField.hs+4−4

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

@@ -55,10 +55,10 @@ import Data.Int (Int16, Int32, Int64)

5555import Data.List (foldl')

5656import Data.Maybe (fromMaybe)

5757import Data.Ratio (Ratio)

58−import Data.Sequence (Seq)

59−import qualified Data.Sequence as S

6058import Data.Time ( UTCTime, ZonedTime, LocalTime, Day, TimeOfDay )

6159import Data.Typeable (Typeable, typeOf)

60+import Data.Vector (Vector)

61+import qualified Data.Vector as V

6262import Data.Word (Word64)

6363import Database.PostgreSQL.Simple.Internal

6464import Database.PostgreSQL.Simple.BuiltinTypes

@@ -245,9 +245,9 @@ instance (FromField a, FromField b) => FromField (Either a b) where

245245 fromField f dat = (Right <$> fromField f dat)

246246 <|> (Left <$> fromField f dat)

247247

248−instance (FromField a, Typeable a) => FromField (Seq a) where

248+instance (FromField a, Typeable a) => FromField (Vector a) where

249249 fromField f dat = either (returnError ConversionFailed f)

250− (S.fromList <$>)

250+ (V.fromList <$>)

251251 (parseOnly (fromArray ',' f) (maybe "" id dat))

252252

253253fromArray :: (FromField a) => Char -> Field -> Parser (Ok [a])

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

@@ -36,11 +36,11 @@ import Database.PostgreSQL.Simple.Types (Binary(..), In(..), Null)

3636import qualified Blaze.ByteString.Builder.Char.Utf8 as Utf8

3737import qualified Data.ByteString as SB

3838import qualified Data.ByteString.Lazy as LB

39−import Data.Foldable (toList)

40−import Data.Sequence (Seq)

4139import qualified Data.Text as ST

4240import qualified Data.Text.Encoding as ST

4341import qualified Data.Text.Lazy as LT

42+import Data.Vector (Vector)

43+import qualified Data.Vector as V

4444import qualified Database.PostgreSQL.LibPQ as PQ

4545import Database.PostgreSQL.Simple.Time

4646

@@ -223,10 +223,10 @@ instance ToField Date where

223223 toField = Plain . inQuotes . dateToBuilder

224224 {-# INLINE toField #-}

225225

226−instance (ToField a) => ToField (Seq a) where

226+instance (ToField a) => ToField (Vector a) where

227227 toField xs = Many $

228228 Plain (fromByteString "ARRAY[") :

229− (intersperse (Plain (fromChar ',')) . map toField $ toList xs) ++

229+ (intersperse (Plain (fromChar ',')) . map toField $ V.toList xs) ++

230230 [Plain (fromChar ']')]

231231 -- Because the ARRAY[...] input syntax is being used, it is possible

232232 -- that the use of type-specific separator characters is unnecessary.