Added handling of empty result sets

timtroendle · timtroendle · commit f8a72cde6cd0 · 2014-11-23T19:45:14.000+01:00
diff --git a/influxdb/misc.py b/influxdb/misc.py
@@ -71,7 +71,10 @@ def query(self, query, time_precision='s', chunked=False):
         result = InfluxDBClient.query(self, query=query,
                                       time_precision=time_precision,
                                       chunked=chunked)
-        return self._to_dataframe(result[0], time_precision)
+        if len(result) > 0:
+            return self._to_dataframe(result[0], time_precision)
+        else:
+            return result
 
     def _to_dataframe(self, json_result, time_precision):
         try:
diff --git a/tests/influxdb/misc_test.py b/tests/influxdb/misc_test.py
@@ -159,6 +159,12 @@ def test_query_into_dataframe(self):
             result = cli.query('select column_one from foo;')
             assert_frame_equal(dataframe, result)
 
+    def test_query_with_empty_result(self):
+        with _mocked_session('get', 200, []):
+            cli = DataFrameClient('host', 8086, 'username', 'password', 'db')
+            result = cli.query('select column_one from foo;')
+            assert result == []
+
     def test_list_series(self):
         response = [
             {
