Fix minor metadata errors

Author: aboudreault

cassandra/__init__.py

@@ -225,8 +225,7 @@ def uses_error_code_map(cls, version):
 
     @classmethod
     def uses_keyspace_flag(cls, version):
-        # OSS was >= cls.V5... we should verify that this change is correct.
-        return version >= cls.DSE_V2
+        return version >= cls.V5 and version != cls.DSE_V1
 
     @classmethod
     def has_continuous_paging_support(cls, version):

cassandra/cluster.py

@@ -875,7 +875,8 @@ def __init__(self,
                  idle_heartbeat_timeout=30,
                  no_compact=False,
                  ssl_context=None,
-                 endpoint_factory=None):
+                 endpoint_factory=None,
+                 monitor_reporting_enabled=False):  # TODO just added for tests purpose before insights integration
         """
         ``executor_threads`` defines the number of threads in a pool for handling asynchronous tasks such as
         extablishing connection pools or refreshing metadata.
@@ -3960,8 +3961,8 @@ def _set_result(self, host, connection, pool, response):
                         self, connection, **response.schema_change_event)
                 elif response.kind == RESULT_KIND_ROWS:
                     self._paging_state = response.paging_state
-                    self._col_types = response.column_names
-                    self._col_names = response.column_types
+                    self._col_types = response.column_types
+                    self._col_names = response.column_names
                     self._set_final_result(self.row_factory(
                         response.column_names, response.parsed_rows))
                 elif response.kind == RESULT_KIND_VOID:

cassandra/protocol.py

@@ -677,10 +677,10 @@ def recv_results_rows(self, f, protocol_version, user_type_map, result_metadata)
             for row in rows:
                 for i in range(len(row)):
                     try:
-                        self.column_typess[i].from_binary(row[i], protocol_version)
+                        self.column_types[i].from_binary(row[i], protocol_version)
                     except Exception as e:
                         raise DriverException('Failed decoding result column "%s" of type %s: %s' % (self.column_names[i],
-                                                                                                     self.column_names[i].cql_parameterized_type(),
+                                                                                                     self.column_types[i].cql_parameterized_type(),
                                                                                                      str(e)))
 
     def recv_results_prepared(self, f, protocol_version, user_type_map):
@@ -910,7 +910,6 @@ def send_body(self, f, protocol_version):
                 write_long(f, self.timestamp)
 
 
-
 class BatchMessage(_MessageType):
     opcode = 0x0D
     name = 'BATCH'