postgres-haskell
diff --git a/‎postgres-wire.cabal
Lines changed: 1 addition & 1 deletion b/‎postgres-wire.cabal
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Database/PostgreSQL/Driver/Connection.hs
Lines changed: 1 addition & 1 deletion b/‎src/Database/PostgreSQL/Driver/Connection.hs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Database/PostgreSQL/Protocol/Encoders.hs
Lines changed: 1 addition & 1 deletion b/‎src/Database/PostgreSQL/Protocol/Encoders.hs
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Database/PostgreSQL/Protocol/Store.hs renamed to ‎src/Database/PostgreSQL/Protocol/Store/Encode.hs
Lines changed: 14 additions & 13 deletions b/‎src/Database/PostgreSQL/Protocol/Store.hs renamed to ‎src/Database/PostgreSQL/Protocol/Store/Encode.hs
Lines changed: 14 additions & 13 deletions
@@ -26,7 +26,7 @@ library
                      , Database.PostgreSQL.Protocol.Types
                      , Database.PostgreSQL.Protocol.Encoders
                      , Database.PostgreSQL.Protocol.Decoders
-                     , Database.PostgreSQL.Protocol.Store
+                     , Database.PostgreSQL.Protocol.Store.Encode
   build-depends:       base >= 4.7 && < 5
                      , bytestring
                      , socket
 
@@ -22,7 +22,7 @@ import Crypto.Hash (hash, Digest, MD5)
 import Database.PostgreSQL.Protocol.Encoders
 import Database.PostgreSQL.Protocol.Decoders
 import Database.PostgreSQL.Protocol.Types
-import Database.PostgreSQL.Protocol.Store (runEncode)
+import Database.PostgreSQL.Protocol.Store.Encode (runEncode)
 
 import Database.PostgreSQL.Driver.Settings
 import Database.PostgreSQL.Driver.StatementStorage
 
@@ -8,7 +8,7 @@ import qualified Data.Vector as V
 import qualified Data.ByteString as B
 
 import Database.PostgreSQL.Protocol.Types
-import Database.PostgreSQL.Protocol.Store
+import Database.PostgreSQL.Protocol.Store.Encode
 
 -- | Protocol Version 3.0, major version in the first word16.
 currentVersion :: Int32
 
@@ -1,15 +1,16 @@
-module Database.PostgreSQL.Protocol.Store where
+module Database.PostgreSQL.Protocol.Store.Encode where
 
-import qualified Data.ByteString as B
-import qualified Data.ByteString.Internal as B(toForeignPtr)
-import qualified Data.Vector as V
-import Data.Store.Core
+import Data.Monoid (Monoid(..), (<>))
+import Foreign (poke, plusPtr, Ptr)
 import Data.Int (Int16, Int32)
-import Data.Word (Word8)
+import Data.Word (Word8, Word16, Word32)
 import Data.Char (ord)
-import Foreign
-import Data.Monoid
-import Data.Foldable
+import Data.Bits (shiftR)
+
+import Data.ByteString (ByteString)
+import Data.ByteString.Internal as B(toForeignPtr)
+import Data.Store.Core (Poke(..), unsafeEncodeWith, pokeStatePtr,
+                        pokeFromForeignPtr)
 
 data Encode = Encode {-# UNPACK #-} !Int !(Poke ())
 
@@ -24,7 +25,7 @@ getEncodeLen :: Encode -> Int
 getEncodeLen (Encode len _) = len
 {-# INLINE getEncodeLen #-}
 
-runEncode :: Encode -> B.ByteString
+runEncode :: Encode -> ByteString
 runEncode (Encode len f) = unsafeEncodeWith f len
 {-# INLINE runEncode #-}
 
@@ -65,14 +66,14 @@ putInt16BE :: Int16 -> Encode
 putInt16BE = putWord16BE . fromIntegral
 {-# INLINE putInt16BE #-}
 
-putByteString :: B.ByteString -> Encode
+putByteString :: ByteString -> Encode
 putByteString bs =
-    let (ptr, offset, len) = B.toForeignPtr bs
+    let (ptr, offset, len) = toForeignPtr bs
     in Encode len $ pokeFromForeignPtr ptr offset len
 {-# INLINE putByteString #-}
 
 -- | C-like string
-putPgString :: B.ByteString -> Encode
+putPgString :: ByteString -> Encode
 putPgString bs = putByteString bs <> putWord8 0
 {-# INLINE putPgString #-}