From 564d41222d8e4b3c147fb8ab3fa22ca5bbbf8391 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 10 Jan 2016 17:53:38 +0000
Subject: Close select tx after close cursor, add error checking

---
 libpqpp/pq-selectcommand.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'libpqpp/pq-selectcommand.cpp')

diff --git a/libpqpp/pq-selectcommand.cpp b/libpqpp/pq-selectcommand.cpp
index 6c02fc4..55dc02c 100644
--- a/libpqpp/pq-selectcommand.cpp
+++ b/libpqpp/pq-selectcommand.cpp
@@ -21,15 +21,12 @@ PQ::SelectCommand::SelectCommand(Connection * conn, const std::string & sql, uns
 
 PQ::SelectCommand::~SelectCommand()
 {
+	if (executed) {
+		c->checkResultFree((PQexec(c->conn, s_close.c_str())), PGRES_COMMAND_OK);
+	}
 	if (txOpened) {
 		c->commitTx();
 	}
-	if (executed) {
-		PQclear(PQexec(c->conn, s_close.c_str()));
-		if (execRes) {
-			PQclear(execRes);
-		}
-	}
 }
 
 std::string
-- 
cgit v1.2.3