Fix compatibility with older versions of postgresql-libpq

Author: lpsmith

src/Database/PostgreSQL/Simple/Copy.hs

@@ -85,8 +85,12 @@ doCopy funcName conn template q = do
       PQ.TuplesOk      -> err
       PQ.CopyOut       -> return ()
       PQ.CopyIn        -> return ()
+#if MIN_VERSION_postgresql_libpq(0,9,3)
       PQ.CopyBoth      -> errMsg "COPY BOTH is not supported"
+#endif
+#if MIN_VERSION_postgresql_libpq(0,9,2)
       PQ.SingleTuple   -> errMsg "single-row mode is not supported"
+#endif
       PQ.BadResponse   -> throwResultError funcName result status
       PQ.NonfatalError -> throwResultError funcName result status
       PQ.FatalError    -> throwResultError funcName result status

src/Database/PostgreSQL/Simple/Internal.hs

@@ -351,6 +351,7 @@ exec conn sql =
             Just res -> do
                 status <- PQ.resultStatus res
                 case status of
+                   -- FIXME: handle PQ.CopyBoth and PQ.SingleTuple
                    PQ.EmptyQuery    -> getResult h mres'
                    PQ.CommandOk     -> getResult h mres'
                    PQ.TuplesOk      -> getResult h mres'
@@ -371,6 +372,7 @@ finishExecute :: Connection -> Query -> PQ.Result -> IO Int64
 finishExecute _conn q result = do
     status <- PQ.resultStatus result
     case status of
+      -- FIXME: handle PQ.CopyBoth and PQ.SingleTuple
       PQ.EmptyQuery -> throwIO $ QueryError "execute: Empty query" q
       PQ.CommandOk -> do
           ncols <- PQ.nfields result

src/Database/PostgreSQL/Simple/Internal/PQResultUtils.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 
 ------------------------------------------------------------------------------
 -- |
@@ -41,8 +42,12 @@ finishQueryWith parser conn q result = do
     PQ.CommandOk     -> queryErr "query resulted in a command response"
     PQ.CopyOut       -> queryErr "query: COPY TO is not supported"
     PQ.CopyIn        -> queryErr "query: COPY FROM is not supported"
+#if MIN_VERSION_postgresql_libpq(0,9,3)
     PQ.CopyBoth      -> queryErr "query: COPY BOTH is not supported"
+#endif
+#if MIN_VERSION_postgresql_libpq(0,9,2)
     PQ.SingleTuple   -> queryErr "query: single-row mode is not supported"
+#endif
     PQ.BadResponse   -> throwResultError "query" result status
     PQ.NonfatalError -> throwResultError "query" result status
     PQ.FatalError    -> throwResultError "query" result status
@@ -67,8 +72,7 @@ getRowWith parser row ncols conn result = do
                       Nothing
                       ""
                       (show (unCol col) ++ " slots in target type")
-                      "mismatch between number of columns to \
-                      \convert and number in target type")
+                      "mismatch between number of columns to convert and number in target type")
     Errors []  -> throwIO $ ConversionFailed "" Nothing "" "" "unknown error"
     Errors [x] -> throwIO x
     Errors xs  -> throwIO $ ManyErrors xs