openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Set models.DEFAULT_KEYSPACE when calling set_session()

Browse Source 
Sets the default keyspace for cqlengine models when passing in an
existing session to cqlengine.connection.set_session() if the session's
keyspace is set and models.DEFAULT_KEYSPACE isn't. Without this, the
user will see an error when trying to perform Cassandra interactions
with a Model instance like "Keyspace none does not exist" unless they
explicitly set models.DEFAULT_KEYSPACE themselves ahead of time or have
a __keyspace__ attribute set on the model.
Also no longer raising an exception in cqlengine.connection.setup() if
default_keyspace isn't set since individual models might still have
__keyspace__ set.
This commit is contained in:
Mike Okner
2015-06-12 14:30:47 -05:00
parent 1b7d7eb1f8
commit b302778623
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cassandra/cqlengine/connection.py
View File

@@ -82,6 +82,11 @@ def set_session(s):
session = s session = s
cluster = s.cluster cluster = s.cluster
# Set default keyspace from given session's keyspace if not already set
from cassandra.cqlengine import models
if not models.DEFAULT_KEYSPACE and session.keyspace:
models.DEFAULT_KEYSPACE = session.keyspace
_register_known_types(cluster) _register_known_types(cluster)
log.debug("cqlengine connection initialized with %s", s) log.debug("cqlengine connection initialized with %s", s)
@@ -109,9 +114,6 @@ def setup(
if 'username' in kwargs or 'password' in kwargs: if 'username' in kwargs or 'password' in kwargs:
raise CQLEngineException("Username & Password are now handled by using the native driver's auth_provider") raise CQLEngineException("Username & Password are now handled by using the native driver's auth_provider")
if not default_keyspace:
raise UndefinedKeyspaceException()
from cassandra.cqlengine import models from cassandra.cqlengine import models
models.DEFAULT_KEYSPACE = default_keyspace models.DEFAULT_KEYSPACE = default_keyspace