Add SingleQueryHasNextQueryResult test case (#3311)

Add `SingleQueryHasNextQueryResult` test case
kuzudb · Apr 18, 2024 · d620c8b · d620c8b
1 parent a3fdcd3
commit d620c8b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/include/main/query_result.h b/src/include/main/query_result.h
@@ -35,6 +35,8 @@ class QueryResult {
 
         bool isEnd() const { return currentResult == nullptr; }
 
+        bool hasNextQueryResult() const { return currentResult->nextQueryResult != nullptr; }
+
         QueryResult* getCurrentResult() const { return currentResult; }
     };
 

diff --git a/src/main/query_result.cpp b/src/main/query_result.cpp
@@ -83,15 +83,12 @@ bool QueryResult::hasNext() const {
 }
 
 bool QueryResult::hasNextQueryResult() const {
-    if (!queryResultIterator.isEnd()) {
-        return true;
-    }
-    return false;
+    return queryResultIterator.hasNextQueryResult();
 }
 
 QueryResult* QueryResult::getNextQueryResult() {
-    ++queryResultIterator;
-    if (!queryResultIterator.isEnd()) {
+    if (hasNextQueryResult()) {
+        ++queryResultIterator;
         return queryResultIterator.getCurrentResult();
     }
     return nullptr;

diff --git a/test/main/connection_test.cpp b/test/main/connection_test.cpp
@@ -128,6 +128,12 @@ TEST_F(ApiTest, MultipleQuery) {
     ASSERT_EQ(result->getNextQueryResult()->toString(), "3\n3\n");
 }
 
+TEST_F(ApiTest, SingleQueryHasNextQueryResult) {
+    auto result = conn->query("MATCH (a:person) RETURN a.fName;");
+    ASSERT_TRUE(result->isSuccess());
+    ASSERT_FALSE(result->hasNextQueryResult());
+}
+
 TEST_F(ApiTest, Prepare) {
     auto result = conn->prepare("");
     ASSERT_EQ(result->getErrorMessage(), "Connection Exception: Query is empty.");
@@ -137,4 +143,4 @@ TEST_F(ApiTest, Prepare) {
                       "N, MANY_MANY);MATCH (a:N)-[:E]->(b:N) WHERE a.ID = 0 return b.ID;");
     ASSERT_EQ(result->getErrorMessage(),
         "Connection Exception: We do not support prepare multiple statements.");
-}
+}