From: Eevee <git@veekun.com>
Date: Mon, 31 Jan 2011 06:29:23 +0000 (-0800)
Subject: Use engine_from_config for database connections.  #390
X-Git-Tag: veekun-promotions/2011021501~6
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/2eb2985a60e6cd216399ea66bd6a976f9abe8868

Use engine_from_config for database connections.  #390
---

diff --git a/pokedex/db/__init__.py b/pokedex/db/__init__.py
index 5230508..0da8713 100644
--- a/pokedex/db/__init__.py
+++ b/pokedex/db/__init__.py
@@ -1,10 +1,10 @@
-from sqlalchemy import MetaData, Table, create_engine, orm
+from sqlalchemy import MetaData, Table, engine_from_config, orm
 
 from ..defaults import get_default_db_uri
 from .tables import metadata
 
 
-def connect(uri=None, session_args={}, engine_args={}):
+def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
     """Connects to the requested URI.  Returns a session object.
 
     With the URI omitted, attempts to connect to a default SQLite database
@@ -15,6 +15,8 @@ def connect(uri=None, session_args={}, engine_args={}):
 
     # If we didn't get a uri, fall back to the default
     if uri is None:
+        uri = engine_args[engine_prefix + 'url']
+    if uri is None:
         uri = get_default_db_uri()
 
     ### Do some fixery for MySQL
@@ -31,7 +33,8 @@ def connect(uri=None, session_args={}, engine_args={}):
             table.kwargs['mysql_charset'] = 'utf8'
 
     ### Connect
-    engine = create_engine(uri, **engine_args)
+    engine_args[engine_prefix + 'url'] = uri
+    engine = engine_from_config(engine_args, prefix=engine_prefix)
     conn = engine.connect()
     metadata.bind = engine