#9 In query response change attribute 'time' to 'timestamp'.

AdvancedClimateSystems · Nov 9, 2016 · aae4efd · aae4efd
1 parent b042cf5
commit aae4efd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/inflow/connection.py b/inflow/connection.py
@@ -50,6 +50,12 @@ def parse_query_response(response):
             values=[]
         )
 
+        try:
+            i = s['columns'].index('time')
+            s['columns'][i] = 'timestamp'
+        except ValueError:
+            pass
+
         for v in s['values']:
             parsed['values'].append({
                 key: value
@@ -84,10 +90,10 @@ def __init__(self, uri, precision='s', retention_policy=None):
             raise ValueError('Should specify a database name.')
 
         self.uri = '{}://{}'.format(
+
             parsed.scheme,
             parsed.hostname
         )
-
         if parsed.port is not None:
             self.uri += ':{}'.format(parsed.port)
 

diff --git a/tests/test_client.py b/tests/test_client.py
@@ -358,12 +358,12 @@ def test_get_measurements(self, client, get):
                     "name": "temperatures",
                     "values": [
                         {
-                            "time": "2016-01-01T00:01:00Z",
+                            "timestamp": "2016-01-01T00:01:00Z",
                             "value": 20.1,
                             "location": "groningen"
                         },
                         {
-                            "time": "2016-01-01T00:02:00Z",
+                            "timestamp": "2016-01-01T00:02:00Z",
                             "value": 23.0,
                             "location": "groningen"
                         }
@@ -374,7 +374,7 @@ def test_get_measurements(self, client, get):
         rv = client.query('SELECT * FROM "temperatures"')
         assert rv[0]['name'] == 'temperatures'
         assert rv[0]['values'][0] == {
-            "time": "2016-01-01T00:01:00Z",
+            "timestamp": "2016-01-01T00:01:00Z",
             "value": 20.1,
             "location": "groningen"
         }