From 46ba8061faa72fb98ac87069be424c5dec06026e Mon Sep 17 00:00:00 2001
From: Adam Holmberg <Adam.Holmberg@datastax.com>
Date: Tue, 10 Feb 2015 13:57:36 -0600
Subject: [PATCH] Additional methods for setting up mapper session.

default - use localhost connection
set_session - use a session bootstrapped in a different context
---
 cassandra/cqlengine/connection.py           | 20 +++++++++++++++++++-
 docs/api/cassandra/cqlengine/connection.rst |  5 ++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/cassandra/cqlengine/connection.py b/cassandra/cqlengine/connection.py
index ae094c28..9ce8591a 100644
--- a/cassandra/cqlengine/connection.py
+++ b/cassandra/cqlengine/connection.py
@@ -36,7 +36,25 @@ Host = namedtuple('Host', ['name', 'port'])
 cluster = None
 session = None
 lazy_connect_args = None
-default_consistency_level = None
+default_consistency_level = ConsistencyLevel.ONE
+
+
+def default():
+    """
+    Configures the global mapper connection to localhost, using the driver defaults
+    """
+    global cluster, session
+    cluster = Cluster()
+    session = cluster.connect()
+
+
+def set_session(s):
+    """
+    Configures the global mapper connection with a preexisting :class:`cassandra.cluster.Session`
+    """
+    global cluster, session
+    session = s
+    cluster = s.cluster
 
 
 def setup(
diff --git a/docs/api/cassandra/cqlengine/connection.rst b/docs/api/cassandra/cqlengine/connection.rst
index 960998c5..184a6026 100644
--- a/docs/api/cassandra/cqlengine/connection.rst
+++ b/docs/api/cassandra/cqlengine/connection.rst
@@ -3,5 +3,8 @@
 
 .. module:: cassandra.cqlengine.connection
 
-.. autofunction:: setup
+.. autofunction:: default
 
+.. autofunction:: set_session
+
+.. autofunction:: setup