projects
/
zzz-pokedex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Egg moves are passed down by the father, not the mother.
[zzz-pokedex.git]
/
pokedex
/
db
/
__init__.py
diff --git
a/pokedex/db/__init__.py
b/pokedex/db/__init__.py
index
0641391
..
ced519b
100644
(file)
--- a/
pokedex/db/__init__.py
+++ b/
pokedex/db/__init__.py
@@
-2,7
+2,7
@@
from sqlalchemy import MetaData, Table, create_engine, orm
from .tables import metadata
from .tables import metadata
-def connect(uri):
+def connect(uri
, **kwargs
):
"""Connects to the requested URI. Returns a session object.
Calling this function also binds the metadata object to the created engine.
"""Connects to the requested URI. Returns a session object.
Calling this function also binds the metadata object to the created engine.
@@
-15,16
+15,20
@@
def connect(uri):
if 'charset' not in uri:
uri += '?charset=utf8'
if 'charset' not in uri:
uri += '?charset=utf8'
- # Tables should be InnoDB, in the event that we're creating them
+ # Tables should be InnoDB, in the event that we're creating them, and
+ # use UTF-8 goddammit!
for table in metadata.tables.values():
table.kwargs['mysql_engine'] = 'InnoDB'
for table in metadata.tables.values():
table.kwargs['mysql_engine'] = 'InnoDB'
+ table.kwargs['mysql_charset'] = 'utf8'
### Connect
engine = create_engine(uri)
conn = engine.connect()
metadata.bind = engine
### Connect
engine = create_engine(uri)
conn = engine.connect()
metadata.bind = engine
- sm = orm.sessionmaker(autoflush=True, autocommit=False, bind=engine)
+ session_args = dict(autoflush=True, autocommit=False, bind=engine)
+ session_args.update(kwargs)
+ sm = orm.sessionmaker(**session_args)
session = orm.scoped_session(sm)
return session
session = orm.scoped_session(sm)
return session