From 2334141f71ed207e28383a92f77ecb9993beee97 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Fri, 16 Sep 2005 16:01:43 +0000
Subject: [PATCH] Backout previous rowcount patch which seems to be causing
 some odd errors with MS ADO.

---
 connection.c | 5 -----
 qresult.c    | 3 ---
 qresult.h    | 1 -
 results.c    | 7 -------
 4 files changed, 16 deletions(-)

diff --git a/connection.c b/connection.c
index 71ac3ad..6b8703d 100644
--- a/connection.c
+++ b/connection.c
@@ -3244,11 +3244,6 @@ LIBPQ_execute_query(ConnectionClass *self,char *query)
 	        PQclear(pgres);
 		return qres;
 	}
-        
-        if (PQresultStatus(pgres) == PGRES_TUPLES_OK)
-        {
-            qres->ntuples = PQntuples(pgres);
-        }
 
 	qres=CC_mapping(self,pgres,qres);
 	QR_set_command(qres, query);
diff --git a/qresult.c b/qresult.c
index d1f922f..9911c63 100644
--- a/qresult.c
+++ b/qresult.c
@@ -135,9 +135,6 @@ QR_Constructor()
 		rv->dl_alloc = 0;
 		rv->dl_count = 0;
 		rv->deleted = NULL;
-#ifdef USE_LIBPQ
-                rv->ntuples = 0;
-#endif
 	}
 
 	mylog("exit QR_Constructor\n");
diff --git a/qresult.h b/qresult.h
index 6776d2a..effa58b 100644
--- a/qresult.h
+++ b/qresult.h
@@ -69,7 +69,6 @@ struct QResultClass_
 
 #ifdef USE_LIBPQ
 	ExecStatusType status;
-        int            ntuples;
 #else
 	QueryResultCode status;
 #endif /* USE_LIBPQ*/
diff --git a/results.c b/results.c
index 36963dc..a280e5e 100644
--- a/results.c
+++ b/results.c
@@ -74,13 +74,6 @@ PGAPI_RowCount(
 		}
 		if (res->recent_processed_row_count >= 0)
 		{
-#ifdef USE_LIBPQ
-                        if (res->recent_processed_row_count == 0 && res->ntuples > 0)
-                        {
-                            *pcrow = res->ntuples;
-                            return SQL_SUCCESS;
-                        }
-#endif
 			*pcrow = res->recent_processed_row_count;
 			mylog("**** PGAPI_RowCount(): THE ROWS: *pcrow = %d\n", *pcrow);
 
-- 
2.39.5