Merge pull request apache#429 from datastax/439

aholmberg · aholmberg · commit 1c54a4607ec5 · 2015-11-03T10:23:32.000-06:00
PYTHON-439 - pass column names through from results message to ResultSet
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -2646,6 +2646,7 @@ class ResponseFuture(object):
 
     _req_id = None
     _final_result = _NOT_SET
+    _col_names = None
     _final_exception = None
     _query_traces = None
     _callbacks = None
@@ -2869,6 +2870,7 @@ def _set_result(self, response):
                     results = getattr(response, 'results', None)
                     if results is not None and response.kind == RESULT_KIND_ROWS:
                         self._paging_state = response.paging_state
+                        self._col_names = results[0]
                         results = self.row_factory(*results)
                     self._set_final_result(results)
             elif isinstance(response, ErrorMessage):
@@ -3286,6 +3288,7 @@ class ResultSet(object):
 
     def __init__(self, response_future, initial_response):
         self.response_future = response_future
+        self.column_names = response_future._col_names
         self._set_current_rows(initial_response)
         self._page_iter = None
         self._list_mode = False
diff --git a/tests/unit/test_concurrent.py b/tests/unit/test_concurrent.py
@@ -33,6 +33,7 @@ class MockResponseResponseFuture():
     """
 
     _query_trace = None
+    _col_names = None
 
     # a list pending callbacks, these will be prioritized in reverse or normal orderd
     pending_callbacks = PriorityQueue()
