Added a toArray function to Cursor in order to fetch everything at once

martin-schilling · martin-schilling · commit 953e3f907205 · 2017-11-23T23:56:46.000+01:00
diff --git a/src/cursor.cpp b/src/cursor.cpp
@@ -125,4 +125,16 @@ namespace arangodb { namespace fuerte { namespace php {
         return static_cast<int>(this->number);
     }
 
+    Php::Value Cursor::toArray() {
+        Php::Array result;
+
+        int counter = 0;
+        while(this->valid()) {
+            result[counter++] = this->current();
+            this->next();
+        }
+
+        return result;
+    }
+
 }}}
diff --git a/src/cursor.h b/src/cursor.h
@@ -54,6 +54,8 @@ namespace arangodb { namespace fuerte { namespace php {
         void next();
         void rewind();
 
+        Php::Value toArray();
+
         virtual ~Cursor() = default;
     };
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -156,6 +156,8 @@ extern "C" {
         cursor.method<&arangodb::fuerte::php::Cursor::rewind>("rewind");
         cursor.method<&arangodb::fuerte::php::Cursor::getCount>("count");
 
+        cursor.method<&arangodb::fuerte::php::Cursor::toArray>("toArray");
+
         cursor.property("ENTRY_TYPE", arangodb::fuerte::php::Cursor::ENTRY_TYPE, Php::Const);
         cursor.property("ENTRY_TYPE_JSON", arangodb::fuerte::php::Cursor::ENTRY_TYPE_JSON, Php::Const);
         cursor.property("ENTRY_TYPE_ARRAY", arangodb::fuerte::php::Cursor::ENTRY_TYPE_ARRAY, Php::Const);
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -225,4 +225,25 @@ public function it_sends_query_and_returns_result_as_array()
 
         $this->assertSame(100, $iterations);
     }
+
+    /**
+     * @test
+     */
+    public function it_creates_array_from_cursor()
+    {
+        $this->connection = TestUtil::getConnection();
+
+        $cursor = $this->connection->query(
+            Vpack::fromArray([
+                'query' => 'FOR i IN 1..100 RETURN [i, i+1]',
+                'batchSize' => 10
+            ]), [
+                Cursor::ENTRY_TYPE => Cursor::ENTRY_TYPE_ARRAY
+            ]
+        );
+
+        $data = $cursor->toArray();
+
+        $this->assertCount(100, $data);
+    }
 }
