veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Use engine_from_config for database connections. #390

Browse source
This commit is contained in:
Eevee 2011-01-30 22:29:23 -08:00
parent 405c90941c
commit 96c5c6a09f
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pokedex/db/__init__.py
View file

@ -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 ..defaults import get_default_db_uri
from .tables import metadata 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. """Connects to the requested URI. Returns a session object.
With the URI omitted, attempts to connect to a default SQLite database With the URI omitted, attempts to connect to a default SQLite database
@ -14,6 +14,8 @@ def connect(uri=None, session_args={}, engine_args={}):
""" """
# If we didn't get a uri, fall back to the default # 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: if uri is None:
uri = get_default_db_uri() uri = get_default_db_uri()
@ -31,7 +33,8 @@ def connect(uri=None, session_args={}, engine_args={}):
table.kwargs['mysql_charset'] = 'utf8' table.kwargs['mysql_charset'] = 'utf8'
### Connect ### 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() conn = engine.connect()
metadata.bind = engine metadata.bind = engine