postgres-haskell
diff --git a/‎postgres-wire.cabal
Lines changed: 1 addition & 0 deletions b/‎postgres-wire.cabal
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Database/PostgreSQL/Driver/Connection.hs
Lines changed: 2 additions & 2 deletions b/‎src/Database/PostgreSQL/Driver/Connection.hs
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Database/PostgreSQL/Protocol/Types.hs
Lines changed: 1 addition & 1 deletion b/‎src/Database/PostgreSQL/Protocol/Types.hs
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/Driver.hs
Lines changed: 25 additions & 0 deletions b/‎tests/Driver.hs
Lines changed: 25 additions & 0 deletions
@@ -70,6 +70,7 @@ test-suite postgres-wire-test
   build-depends:       base
                      , postgres-wire
                      , bytestring
+                     , vector
                      , tasty
                      , tasty-hunit
   ghc-options:         -threaded -rtsopts -with-rtsopts=-N
 
@@ -404,10 +404,10 @@ collectBeforeReadyForQuery conn = do
 -- | Public
 describeStatement
     :: Connection
-    -> StatementSQL
+    -> B.ByteString
     -> IO (Either Error (V.Vector Oid, V.Vector FieldDescription))
 describeStatement conn stmt = do
-    sendMessage s $ Parse sname stmt []
+    sendMessage s $ Parse sname (StatementSQL stmt) []
     sendMessage s $ DescribeStatement sname
     sendMessage s Sync
     parseMessages <$> collectBeforeReadyForQuery conn
 
@@ -16,7 +16,7 @@ import Data.ByteString (ByteString)
 import Data.Vector (Vector)
 
 -- Common
-newtype Oid           = Oid { unOid :: Int32 }    deriving (Show)
+newtype Oid           = Oid { unOid :: Int32 }    deriving (Show, Eq)
 newtype StatementName = StatementName ByteString  deriving (Show)
 newtype StatementSQL  = StatementSQL ByteString   deriving (Show, Eq, Hashable)
 newtype PortalName    = PortalName ByteString     deriving (Show)
 
@@ -6,6 +6,7 @@ import Control.Monad
 import Data.Either
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Char8 as BS
+import qualified Data.Vector as V
 
 import Test.Tasty
 import Test.Tasty.HUnit
@@ -22,6 +23,9 @@ testDriver = testGroup "Driver"
     , testCase "Empty query" testEmptyQuery
     , testCase "Query without result" testQueryWithoutResult
     , testCase "Invalid queries" testInvalidBatch
+    , testCase "Describe statement" testDescribeStatement
+    , testCase "Describe statement with no data" testDescribeStatementNoData
+    , testCase "Describe empty statement" testDescribeStatementEmpty
     ]
 
 makeQuery1 :: B.ByteString -> Query
@@ -117,3 +121,24 @@ testInvalidBatch = do
         readReadyForQuery c
         checkInvalidResult c $ length qs
 
+testDescribeStatement :: IO ()
+testDescribeStatement = withConnection $ \c -> do
+    r <- describeStatement c $
+               "select typname, typnamespace, typowner, typlen, typbyval,"
+            <> "typcategory, typispreferred, typisdefined, typdelim, typrelid,"
+            <> "typelem, typarray from pg_type where typtypmod = $1 "
+            <> "and typisdefined = $2"
+    assertBool "Should be Right" $ isRight r
+
+testDescribeStatementNoData :: IO ()
+testDescribeStatementNoData = withConnection $ \c -> do
+    r <- fromRight <$> describeStatement c "SET client_encoding TO UTF8"
+    assertBool "Should be empty" $ V.null (fst r)
+    assertBool "Should be empty" $ V.null (snd r)
+
+testDescribeStatementEmpty :: IO ()
+testDescribeStatementEmpty = withConnection $ \c -> do
+    r <- fromRight <$> describeStatement c ""
+    assertBool "Should be empty" $ V.null (fst r)
+    assertBool "Should be empty" $ V.null (snd r)
+