projects
/
zzz-pokedex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update test_schema to the new API. Add some missing column metadata.
[zzz-pokedex.git]
/
pokedex
/
tests
/
test_schema.py
diff --git
a/pokedex/tests/test_schema.py
b/pokedex/tests/test_schema.py
index
c050c87
..
2cba7e0
100644
(file)
--- a/
pokedex/tests/test_schema.py
+++ b/
pokedex/tests/test_schema.py
@@
-3,9
+3,11
@@
from nose.tools import *
import unittest
from sqlalchemy import Column, Integer, String, create_engine
from sqlalchemy.orm import class_mapper, joinedload, sessionmaker
import unittest
from sqlalchemy import Column, Integer, String, create_engine
from sqlalchemy.orm import class_mapper, joinedload, sessionmaker
+from sqlalchemy.orm.session import Session
from sqlalchemy.ext.declarative import declarative_base
from pokedex.db import tables, markdown
from sqlalchemy.ext.declarative import declarative_base
from pokedex.db import tables, markdown
+from pokedex.db.multilang import create_translation_table
def test_variable_names():
"""We want pokedex.db.tables to export tables using the class name"""
def test_variable_names():
"""We want pokedex.db.tables to export tables using the class name"""
@@
-21,7
+23,7
@@
def test_variable_names():
classname = table.__name__
if classname and varname[0].isupper():
assert varname == classname, '%s refers to %s' % (varname, classname)
classname = table.__name__
if classname and varname[0].isupper():
assert varname == classname, '%s refers to %s' % (varname, classname)
- for table in tables.
table
_classes:
+ for table in tables.
mapped
_classes:
assert getattr(tables, table.__name__) is table
def test_i18n_table_creation():
assert getattr(tables, table.__name__) is table
def test_i18n_table_creation():
@@
-30,7
+32,7
@@
def test_i18n_table_creation():
various proxies and columns works.
"""
Base = declarative_base()
various proxies and columns works.
"""
Base = declarative_base()
- engine = create_engine("sqlite:///:memory:")
+ engine = create_engine("sqlite:///:memory:"
, echo=True
)
Base.metadata.bind = engine
Base.metadata.bind = engine
@@
-44,27
+46,31
@@
def test_i18n_table_creation():
__tablename__ = 'foos'
__singlename__ = 'foo'
id = Column(Integer, primary_key=True, nullable=False)
__tablename__ = 'foos'
__singlename__ = 'foo'
id = Column(Integer, primary_key=True, nullable=False)
+ translation_classes = []
- FooText = tables.makeTextTable(
- foreign_table_class=Foo,
- table_suffix_plural='blorp',
- table_suffix_singular='klink',
- columns=[
- ('name', 'names', Column(String(100))),
- ],
- lazy='select',
- Language=Language,
+ FooText = create_translation_table('foo_text', Foo, 'texts',
+ language_class=Language,
+ name = Column(String(100)),
)
)
+ class FauxSession(Session):
+ def execute(self, clause, params=None, *args, **kwargs):
+ if not params:
+ params = {}
+ params.setdefault('_default_language', 'en')
+ return super(FauxSession, self).execute(clause, params, *args, **kwargs)
+
# OK, create all the tables and gimme a session
Base.metadata.create_all()
# OK, create all the tables and gimme a session
Base.metadata.create_all()
- sess = sessionmaker(engine)()
+ sess = sessionmaker(engine
, class_=FauxSession
)()
# Create some languages and foos to bind together
lang_en = Language(identifier='en')
sess.add(lang_en)
lang_jp = Language(identifier='jp')
sess.add(lang_jp)
# Create some languages and foos to bind together
lang_en = Language(identifier='en')
sess.add(lang_en)
lang_jp = Language(identifier='jp')
sess.add(lang_jp)
+ lang_ru = Language(identifier='ru')
+ sess.add(lang_ru)
foo = Foo()
sess.add(foo)
foo = Foo()
sess.add(foo)
@@
-74,14
+80,14
@@
def test_i18n_table_creation():
# Give our foo some names, as directly as possible
foo_text = FooText()
# Give our foo some names, as directly as possible
foo_text = FooText()
- foo_text.
object
_id = foo.id
- foo_text.language_id = lang_en.id
+ foo_text.
foreign
_id = foo.id
+ foo_text.l
ocal_l
anguage_id = lang_en.id
foo_text.name = 'english'
sess.add(foo_text)
foo_text = FooText()
foo_text.name = 'english'
sess.add(foo_text)
foo_text = FooText()
- foo_text.
object
_id = foo.id
- foo_text.language_id = lang_jp.id
+ foo_text.
foo
_id = foo.id
+ foo_text.l
ocal_l
anguage_id = lang_jp.id
foo_text.name = 'nihongo'
sess.add(foo_text)
foo_text.name = 'nihongo'
sess.add(foo_text)
@@
-89,46
+95,57
@@
def test_i18n_table_creation():
sess.commit()
### Test 1: re-fetch foo and check its attributes
sess.commit()
### Test 1: re-fetch foo and check its attributes
- foo = sess.query(Foo).one()
+ foo = sess.query(Foo).
params(_default_language='en').
one()
# Dictionary of language identifiers => names
# Dictionary of language identifiers => names
- assert foo.name
s['en'
] == 'english'
- assert foo.name
s['jp'
] == 'nihongo'
+ assert foo.name
_map[lang_en
] == 'english'
+ assert foo.name
_map[lang_jp
] == 'nihongo'
# Default language, currently English
assert foo.name == 'english'
sess.expire_all()
# Default language, currently English
assert foo.name == 'english'
sess.expire_all()
- ### Test 2: joinedload on the default name should appear to work
+ ### Test 2: querying by default language name should work
+ foo = sess.query(Foo).filter_by(name='english').one()
+
+ assert foo.name == 'english'
+
+ sess.expire_all()
+
+ ### Test 3: joinedload on the default name should appear to work
+ # THIS SHOULD WORK SOMEDAY
+ # .options(joinedload(Foo.name)) \
foo = sess.query(Foo) \
foo = sess.query(Foo) \
- .options(joinedload(Foo.
name
)) \
- .
first
+ .options(joinedload(Foo.
texts_local
)) \
+ .
one()
assert foo.name == 'english'
sess.expire_all()
assert foo.name == 'english'
sess.expire_all()
- ### Test 3: joinedload on all the names should appear to work
+ ### Test 4: joinedload on all the names should appear to work
+ # THIS SHOULD ALSO WORK SOMEDAY
+ # .options(joinedload(Foo.name_map)) \
foo = sess.query(Foo) \
foo = sess.query(Foo) \
- .options(joinedload(Foo.
name
s)) \
- .
first
+ .options(joinedload(Foo.
text
s)) \
+ .
one()
- assert foo.name
s['en'
] == 'english'
- assert foo.name
s['jp'
] == 'nihongo'
+ assert foo.name
_map[lang_en
] == 'english'
+ assert foo.name
_map[lang_jp
] == 'nihongo'
sess.expire_all()
sess.expire_all()
- ### Test
4
: Mutating the dict collection should work
- foo = sess.query(Foo).
first
+ ### Test
5
: Mutating the dict collection should work
+ foo = sess.query(Foo).
one()
- foo.name
s['en'
] = 'different english'
- del foo.names['jp']
+ foo.name
_map[lang_en
] = 'different english'
+ foo.name_map[lang_ru] = 'new russian'
sess.commit()
sess.commit()
- assert foo.name
s['en'
] == 'different english'
- assert
'jp' not in foo.names
+ assert foo.name
_map[lang_en
] == 'different english'
+ assert
foo.name_map[lang_ru] == 'new russian'
def test_texts():
"""Check DB schema for integrity of text columns & translations.
def test_texts():
"""Check DB schema for integrity of text columns & translations.
@@
-136,15
+153,19
@@
def test_texts():
Mostly protects against copy/paste oversights and rebase hiccups.
If there's a reason to relax the tests, do it
"""
Mostly protects against copy/paste oversights and rebase hiccups.
If there's a reason to relax the tests, do it
"""
- for table in sorted(tables.table_classes, key=lambda t: t.__name__):
- if issubclass(table, tables.LanguageSpecific):
+ classes = []
+ for cls in tables.mapped_classes:
+ classes.append(cls)
+ classes += cls.translation_classes
+ for cls in classes:
+ if hasattr(cls, 'local_language') or hasattr(cls, 'language'):
good_formats = 'markdown plaintext gametext'.split()
assert_text = '%s is language-specific'
else:
good_formats = 'identifier latex'.split()
assert_text = '%s is not language-specific'
good_formats = 'markdown plaintext gametext'.split()
assert_text = '%s is language-specific'
else:
good_formats = 'identifier latex'.split()
assert_text = '%s is not language-specific'
-
mapper = class_mapper(tabl
e)
- for column in
sorted(mapper.c, key=lambda c: c.name)
:
+
columns = sorted(cls.__table__.c, key=lambda c: c.nam
e)
+ for column in
columns
:
format = column.info.get('format', None)
if format is not None:
if format not in good_formats:
format = column.info.get('format', None)
if format is not None:
if format not in good_formats:
@@
-169,11
+190,8
@@
def test_identifiers_with_names():
...have either names or identifiers.
"""
...have either names or identifiers.
"""
- for table in sorted(tables.table_classes, key=lambda t: t.__name__):
- if issubclass(table, tables.Named):
- assert issubclass(table, tables.OfficiallyNamed) or issubclass(table, tables.UnofficiallyNamed), table
+ for table in sorted(tables.mapped_classes, key=lambda t: t.__name__):
+ if hasattr(table, 'name'):
assert hasattr(table, 'identifier'), table
else:
assert not hasattr(table, 'identifier'), table
assert hasattr(table, 'identifier'), table
else:
assert not hasattr(table, 'identifier'), table
- if not issubclass(table, tables.LanguageSpecific):
- assert not hasattr(table, 'name'), table