From 72cd8b82bde79d7e11be577b7fc60c2fb433a283 Mon Sep 17 00:00:00 2001 From: danibrutal Date: Thu, 18 Jun 2015 15:37:41 +0200 Subject: [PATCH] Throws Exception in constructor for error in first serie --- src/Leaseweb/InfluxDB/ResultSet.php | 6 +++++- tests/unit/ResultSetTest.php | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Leaseweb/InfluxDB/ResultSet.php b/src/Leaseweb/InfluxDB/ResultSet.php index 6a5a1deb84..f9c932b91f 100644 --- a/src/Leaseweb/InfluxDB/ResultSet.php +++ b/src/Leaseweb/InfluxDB/ResultSet.php @@ -41,6 +41,10 @@ class ResultSet // There was an error in the query thrown by influxdb if (isset($this->parsedResults['error'])) { throw new InfluxDBClientError($this->parsedResults['error']); + + // Check if there are errors in the first serie + } elseif (isset($this->parsedResults['results'][0]['error'])) { + throw new InfluxDBClientError($this->parsedResults['results'][0]['error']); } } @@ -80,7 +84,7 @@ class ResultSet public function getSeries() { $pickSeries = function ($object) { - + if (isset($object['error'])) { throw new InfluxDBClientError($object['error']); } diff --git a/tests/unit/ResultSetTest.php b/tests/unit/ResultSetTest.php index ce1471d10e..024da364ff 100644 --- a/tests/unit/ResultSetTest.php +++ b/tests/unit/ResultSetTest.php @@ -57,8 +57,7 @@ EOD; ] } EOD; - $rs = new ResultSet($errorResult); - $rs->getSeries(); + new ResultSet($errorResult); } /**