Fix conversion of backend-generated timestamp values.

BQ returns them as strings, representing UNIX timestamp seconds-since-epoch to microsecond precision. Fixes #1125.
googleapis · Sep 10, 2015 · e004a76 · e004a76
1 parent 51427ec
commit e004a76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/gcloud/bigquery/table.py b/gcloud/bigquery/table.py
@@ -18,6 +18,7 @@
 
 import six
 
+from gcloud._helpers import UTC
 from gcloud._helpers import _datetime_from_microseconds
 from gcloud._helpers import _millis_from_datetime
 from gcloud.exceptions import NotFound
@@ -761,8 +762,9 @@ def _bool_from_json(value, field):
 
 def _datetime_from_json(value, field):
     if _not_null(value, field):
-        # Field value will be in milliseconds.
-        return _datetime_from_microseconds(1000.0 * float(value))
+        # value will be a float in seconds, to microsecond precision, in UTC.
+        stamp = datetime.datetime.utcfromtimestamp(float(value))
+        return stamp.replace(tzinfo=UTC)
 
 
 def _record_from_json(value, field):

diff --git a/gcloud/bigquery/test_table.py b/gcloud/bigquery/test_table.py
@@ -824,7 +824,6 @@ def test_fetch_data_w_bound_client(self):
         import datetime
         from gcloud._helpers import UTC
         from gcloud.bigquery.table import SchemaField
-        from gcloud._helpers import _millis_from_datetime
 
         PATH = 'projects/%s/datasets/%s/tables/%s/data' % (
             self.PROJECT, self.DS_NAME, self.TABLE_NAME)
@@ -835,24 +834,29 @@ def test_fetch_data_w_bound_client(self):
         WHEN_2 = WHEN + datetime.timedelta(seconds=2)
         ROWS = 1234
         TOKEN = 'TOKEN'
+
+        def _bigquery_timestamp_float_repr(ts_float):
+            # Preserve microsecond precision for E+09 timestamps
+            return '%0.15E' % (ts_float,)
+
         DATA = {
             'totalRows': ROWS,
             'pageToken': TOKEN,
             'rows': [
                 {'f': [
                     {'v': 'Phred Phlyntstone'},
                     {'v': '32'},
-                    {'v': _millis_from_datetime(WHEN)},
+                    {'v': _bigquery_timestamp_float_repr(WHEN_TS)},
                 ]},
                 {'f': [
                     {'v': 'Bharney Rhubble'},
                     {'v': '33'},
-                    {'v': _millis_from_datetime(WHEN_1)},
+                    {'v': _bigquery_timestamp_float_repr(WHEN_TS + 1)},
                 ]},
                 {'f': [
                     {'v': 'Wylma Phlyntstone'},
                     {'v': '29'},
-                    {'v': _millis_from_datetime(WHEN_2)},
+                    {'v': _bigquery_timestamp_float_repr(WHEN_TS + 2)},
                 ]},
                 {'f': [
                     {'v': 'Bhettye Rhubble'},
@@ -861,6 +865,7 @@ def test_fetch_data_w_bound_client(self):
                 ]},
             ]
         }
+
         conn = _Connection(DATA)
         client = _Client(project=self.PROJECT, connection=conn)
         dataset = _Dataset(client)