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

Remove table renaming from connect(), instead require 'from pokedex.db.oracle import *' followed by 'rewrite_long_table_names()';

Browse source
This commit is contained in:
Epithumia 2013-12-19 13:45:07 +01:00
parent 33d2940b1b
commit 6c0074b1a5
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pokedex/db/__init__.py
View file

@ -6,7 +6,6 @@ from sqlalchemy import engine_from_config, orm
from ..defaults import get_default_db_uri from ..defaults import get_default_db_uri
from .tables import Language, metadata from .tables import Language, metadata
from .multilang import MultilangSession, MultilangScopedSession from .multilang import MultilangSession, MultilangScopedSession
from .oracle import rewrite_long_table_names, restore_long_table_names
ENGLISH_ID = 9 ENGLISH_ID = 9
@ -46,15 +45,6 @@ def connect(uri=None, session_args={}, engine_args={}, engine_prefix=''):
if 'auto_setinputsizes' not in uri: if 'auto_setinputsizes' not in uri:
uri += '?auto_setinputsizes=FALSE' uri += '?auto_setinputsizes=FALSE'
# Shorten table names, Oracle limits table and column names to 30 chars
# Easy solution : drop the vowels, differents words are unlikely to
# end up the same after the vowels are gone
rewrite_long_table_names(metadata.tables)
else:
restore_long_table_names(metadata.tables)
### Connect ### Connect
engine_args[engine_prefix + 'url'] = uri engine_args[engine_prefix + 'url'] = uri
engine = engine_from_config(engine_args, prefix=engine_prefix) engine = engine_from_config(engine_args, prefix=engine_prefix)

2
pokedex/db/load.py
View file

@ -138,7 +138,7 @@ def load(session, tables=[], directory=None, drop_tables=False, verbose=False, s
table_names = _get_table_names(metadata, tables) table_names = _get_table_names(metadata, tables)
table_objs = [metadata.tables[name] for name in table_names] table_objs = [metadata.tables[name] for name in table_names]
# Oracle fixery again, load doesn't know we modified the schema # Oracle fixery, load needs short names
# flag for oracle stuff # flag for oracle stuff
oranames = (session.connection().dialect.name == 'oracle') oranames = (session.connection().dialect.name == 'oracle')
if oranames: if oranames: