From eddbb27048c05d3a719acb71534b95d70d85706c Mon Sep 17 00:00:00 2001 From: randomdan Date: Wed, 30 Mar 2011 18:56:11 +0000 Subject: Allow PQ_TUPLES_OK as an ok reply for modify commands (for cases when a function was called using SELECT func(...)) --- libpqpp/connection.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libpqpp/connection.cpp') diff --git a/libpqpp/connection.cpp b/libpqpp/connection.cpp index 11c043e..8bfc2ff 100644 --- a/libpqpp/connection.cpp +++ b/libpqpp/connection.cpp @@ -105,15 +105,15 @@ PQ::Connection::newModifyCommand(const std::string & sql) const } bool -PQ::Connection::checkResultInt(PGresult * res, int expected) +PQ::Connection::checkResultInt(PGresult * res, int expected, int alt) { - return (PQresultStatus(res) == expected); + return (PQresultStatus(res) == expected) || (alt != -1 && (PQresultStatus(res) == alt)); } PGresult * -PQ::Connection::checkResult(PGresult * res, int expected) const +PQ::Connection::checkResult(PGresult * res, int expected, int alt) const { - if (!checkResultInt(res, expected)) { + if (!checkResultInt(res, expected, alt)) { PQclear(res); throw Error(PQerrorMessage(conn)); } @@ -121,9 +121,9 @@ PQ::Connection::checkResult(PGresult * res, int expected) const } void -PQ::Connection::checkResultFree(PGresult * res, int expected) const +PQ::Connection::checkResultFree(PGresult * res, int expected, int alt) const { - if (!checkResultInt(res, expected)) { + if (!checkResultInt(res, expected, alt)) { PQclear(res); throw Error(PQerrorMessage(conn)); } -- cgit v1.2.3