Merge pull request #43 from sandrokeil/hotfix/check-error

sandrokeil · web-flow · commit ff67a6fe036d · 2017-12-10T15:55:49.000+01:00
Add check if response keys available
diff --git a/src/connection.cpp b/src/connection.cpp
@@ -114,15 +114,20 @@ namespace arangodb { namespace fuerte { namespace php {
         auto response = new Response(*result);
 
         bool failure = false;
-        if(response->getFuerteResponse()->slices().front().isObject()) {
+
+        if (response->getFuerteResponse()->slices().front().isObject()
+            && response->getFuerteResponse()->slices().front().hasKey("error")
+        ) {
             failure = response->getFuerteResponse()->slices().front().get("error").getBool();
         }
 
         auto statusCode = response->getHttpCode();
         if((!(statusCode >= 200 && statusCode <= 299)) || failure) {
             std::string errorMessage = "Response contains an error";
 
-            if(response->getFuerteResponse()->slices().front().isObject()) {
+            if(response->getFuerteResponse()->slices().front().isObject()
+               && response->getFuerteResponse()->slices().front().hasKey("errorMessage")
+            ) {
                 errorMessage = response->getFuerteResponse()->slices().front().get("errorMessage").copyString();
             }
 
diff --git a/src/cursor.cpp b/src/cursor.cpp
@@ -24,13 +24,26 @@ namespace arangodb { namespace fuerte { namespace php {
         Response* response = this->connection->sendRequest(&request);
         this->response = response;
 
-        if(this->response->getFuerteResponse()->slices().front().get("error").getBool()) {
-            ARANGODB_THROW(
-                RuntimeException(),
-                ("Error while executing query in %s on line %d: " +
-                    this->response->getFuerteResponse()->slices().front().get("errorMessage").copyString()).c_str()
-            );
+        bool failure = false;
 
+        if (this->response->getFuerteResponse()->slices().front().isObject()
+            && this->response->getFuerteResponse()->slices().front().hasKey("error")
+        ) {
+            failure = this->response->getFuerteResponse()->slices().front().get("error").getBool();
+        }
+
+        auto statusCode = this->response->getHttpCode();
+
+        if((!(statusCode >= 200 && statusCode <= 299)) || failure) {
+            std::string errorMessage = "Response contains an error";
+
+            if(this->response->getFuerteResponse()->slices().front().isObject()
+               && this->response->getFuerteResponse()->slices().front().hasKey("errorMessage")
+            ) {
+                errorMessage = this->response->getFuerteResponse()->slices().front().get("errorMessage").copyString();
+            }
+
+            throwRequestFailedException(errorMessage.c_str(), statusCode, this->response->getBody());
             return;
         }
 
diff --git a/tests/CursorTest.php b/tests/CursorTest.php
@@ -247,4 +247,23 @@ public function it_rewinds_cursor_half_way_through()
         $this->assertCount(100, $dataSet2);
         $this->assertSame($dataSet1, \array_slice($dataSet2, 0, 50));
     }
+
+    /**
+     * @test
+     */
+    public function it_throws_exception_if_collection_not_found()
+    {
+        $collection = 'event_streams';
+        $this->connection = TestUtil::getConnection();
+
+        $this->expectException(\ArangoDb\RequestFailedException::class);
+
+        $cursor = $this->connection->query(Vpack::fromArray([
+            'query' => 'FOR c IN @@collection RETURN c',
+            'bindVars' => ['@collection' => $collection]
+        ]));
+
+        $cursor->rewind();
+        $iterations = 0;
+    }
 }
