Merge pull request apache#849 from datastax/python-fix-prepared

mambocab · web-flow · commit 3c5000bf91e3 · 2017-10-27T13:10:42.000-04:00
Don't set the keyspace if it's already set in the session
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -21,6 +21,7 @@ Bug Fixes
 * Fix sites where `sessions` can change during iteration (PYTHON-793)
 * cqlengine: allow min_length=0 for Ascii and Text column types (PYTHON-735)
 * Rare exception when "sys.exit(0)" after query timeouts (PYTHON-752)
+* Dont set the session keyspace when preparing statements (PYTHON-843)
 
 Others
 ------
diff --git a/cassandra/cluster.py b/cassandra/cluster.py
@@ -2356,7 +2356,7 @@ def prepare(self, query, custom_payload=None, keyspace=None):
             log.exception("Error preparing query:")
             raise
 
-        prepared_keyspace = keyspace if keyspace else self.keyspace
+        prepared_keyspace = keyspace if keyspace else None
         prepared_statement = PreparedStatement.from_message(
             query_id, bind_metadata, pk_indexes, self.cluster.metadata, query, self.keyspace,
             self._protocol_version, result_metadata, result_metadata_id)
