From 54e9d47a4eba26bf0565f47cfaeebe361355f502 Mon Sep 17 00:00:00 2001
From: Bogdan Pintea <bpintea@gmail.com>
Date: Thu, 5 Sep 2019 09:17:00 +0200
Subject: [PATCH] SQLRowCount: always return row set size (#182)

With this commit SQLRowCount() will always return the size of current
row set, also in the case a cursor is present.

The previous implementation returned 0 when a cursor was present, since
the function can't evaluate the total result set size (without actually
fetching it all) and applications shouldn't rely on this result.

The driver - that internally also uses the function for SYS queries -
assumed that ES/SQL will never return a cursor for SYS commands. This
seems however not to be a valid assumption.

(cherry picked from commit 105824289307628e0106250dd4f715fbc30f7e71)
---
 driver/queries.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/driver/queries.c b/driver/queries.c
index a7e96230..db0a76e8 100644
--- a/driver/queries.c
+++ b/driver/queries.c
@@ -4040,28 +4040,30 @@ SQLRETURN EsSQLRowCount(_In_ SQLHSTMT StatementHandle, _Out_ SQLLEN *RowCount)
 		RET_HDIAGS(stmt, SQL_STATE_HY010);
 	}
 
-	if (STMT_HAS_CURSOR(stmt)) {
-		/* fetch_size or scroller size chunks the result */
-		ERRH(stmt, "can't evaluate the total size of paged result set.");
-		/* returning a _WITH_INFO here will fail the query for MSQRY32. */
-#		if 0
-		RET_HDIAG(stmt, SQL_STATE_01000, "row count is for partial result "
-			"only", 0);
-#		endif /* 0 */
-		*RowCount = 0;
+	if (stmt->rset.pack_json) {
+		*RowCount = UJLengthArray(stmt->rset.pack.json.rows_obj);
 	} else {
-		if (stmt->rset.pack_json) {
-			*RowCount = UJLengthArray(stmt->rset.pack.json.rows_obj);
-		} else {
-			res = cbor_get_array_count(stmt->rset.pack.cbor.rows_obj, &nrows);
-			if (res != CborNoError) {
-				ERRH(stmt, "failed to read row array count: %s.",
-					cbor_error_string(res));
-				RET_HDIAGS(stmt, SQL_STATE_HY000);
-			}
-			*RowCount = (SQLLEN)nrows;
+		res = cbor_get_array_count(stmt->rset.pack.cbor.rows_obj, &nrows);
+		if (res != CborNoError) {
+			ERRH(stmt, "failed to read row array count: %s.",
+				cbor_error_string(res));
+			RET_HDIAGS(stmt, SQL_STATE_HY000);
 		}
-		DBGH(stmt, "result set rows count: %zd.", *RowCount);
+		*RowCount = (SQLLEN)nrows;
+	}
+	DBGH(stmt, "result set rows count: %zd.", *RowCount);
+
+	/* Log a warning if a cursor is present.
+	 * Note: ES/SQL can apparently attach a cursor even for SYS queries and no
+	 * restrictive max fetch row count. Since this function is now also called
+	 * while attaching types during bootstrapping, it shouldn't fail if a
+	 * cursor is attached. This assumes however that ES will never return just
+	 * a cursor (and no rows) on a first page. */
+	if (STMT_HAS_CURSOR(stmt)) {
+		/* fetch_size or scroller size will chunk the result */
+		WARNH(stmt, "can't evaluate the total size of paged result set.");
+		RET_HDIAG(stmt, SQL_STATE_01000, "row count is for current row set "
+			"only", 0);
 	}
 
 	return SQL_SUCCESS;