Added function to get the raw response from the cursor

martin-schilling · martin-schilling · commit d16792343e39 · 2017-11-24T20:45:37.000+01:00
diff --git a/src/cursor.cpp b/src/cursor.cpp
@@ -139,4 +139,8 @@ namespace arangodb { namespace fuerte { namespace php {
         return result;
     }
 
+    Php::Value Cursor::getResponse() {
+        return Php::Object("ArangoDb\\Response", this->response);
+    }
+
 }}}
diff --git a/src/cursor.h b/src/cursor.h
@@ -55,6 +55,7 @@ namespace arangodb { namespace fuerte { namespace php {
         void rewind();
 
         Php::Value toArray();
+        Php::Value getResponse();
 
         virtual ~Cursor() = default;
     };
diff --git a/src/main.cpp b/src/main.cpp
@@ -157,6 +157,7 @@ extern "C" {
         cursor.method<&arangodb::fuerte::php::Cursor::getCount>("count");
 
         cursor.method<&arangodb::fuerte::php::Cursor::toArray>("toArray");
+        cursor.method<&arangodb::fuerte::php::Cursor::getResponse>("getResponse");
 
         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);
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -281,4 +281,61 @@ public function it_rewinds_cursor_multiple_times()
         $this->assertSame(200, $iterations);
         $this->assertTrue($dataSet1 === $dataSet2);
     }
+
+
+    /**
+     * @test
+     */
+    public function it_gets_raw_response_from_cursor()
+    {
+        $this->connection = TestUtil::getConnection();
+
+        $cursor = $this->connection->query(Vpack::fromArray([
+            'query' => 'FOR i IN 1..100 RETURN [i, i+1]',
+            'batchSize' => 10
+        ]));
+
+        $response = $cursor->getResponse();
+
+        $this->assertInstanceOf(\ArangoDb\Response::class, $response);
+        $this->assertTrue(TestUtil::wasSuccessful($response));
+    }
+
+
+    /**
+     * @test
+     */
+    public function it_rewinds_cursor_half_way_through()
+    {
+        $this->connection = TestUtil::getConnection();
+
+        $cursor = $this->connection->query(Vpack::fromArray([
+            'query' => 'FOR i IN 1..100 RETURN [i, i+1]',
+            'batchSize' => 10
+        ]));
+
+        $iterations = 0;
+        $dataSet1 = [];
+        $dataSet2 = [];
+
+        for($i = 0; $i < 50; $i++) {
+            $cursor->valid();
+            $dataSet1[] = $cursor->current();
+            $cursor->next();
+            $iterations++;
+        }
+
+        $cursor->rewind();
+
+        while($cursor->valid()) {
+            $dataSet2[] = $cursor->current();
+            $cursor->next();
+            $iterations++;
+        }
+
+        $this->assertSame(150, $iterations);
+        $this->assertCount(50, $dataSet1);
+        $this->assertCount(100, $dataSet2);
+        $this->assertTrue($dataSet1 === array_slice($dataSet2, 0, 50));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -139,4 +139,8 @@ namespace arangodb { namespace fuerte { namespace php {`
`139`	`139`	`return result;`
`140`	`140`	`}`
`141`	`141`
	`142`	`+ Php::Value Cursor::getResponse() {`
	`143`	`+ return Php::Object("ArangoDb\\Response", this->response);`
	`144`	`+ }`
	`145`	`+`
`142`	`146`	`}}}`