X-Git-Url: http://git.veekun.com/zzz-pokedex.git/blobdiff_plain/98328e173a5568a6c64d3315dfe0c0c4b3a0662d..43d857b9ea43ccee6ec41c2ddbd79c8bef40cb3d:/pokedex/tests/test_schema.py

diff --git a/pokedex/tests/test_schema.py b/pokedex/tests/test_schema.py
index 804e3c8..0518ed8 100644
--- a/pokedex/tests/test_schema.py
+++ b/pokedex/tests/test_schema.py
@@ -7,7 +7,8 @@ from sqlalchemy.orm.session import Session
 from sqlalchemy.ext.declarative import declarative_base
 
 from pokedex.db import tables, markdown
-from pokedex.db.multilang import create_translation_table
+from pokedex.db.multilang import MultilangScopedSession, MultilangSession, \
+    create_translation_table
 
 def test_variable_names():
     """We want pokedex.db.tables to export tables using the class name"""
@@ -63,16 +64,10 @@ def test_i18n_table_creation():
         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()
-    sess = sessionmaker(engine, class_=FauxSession)()
+    sm = sessionmaker(class_=MultilangSession)
+    sess = MultilangScopedSession(sm)
 
     # Create some languages and foos to bind together
     lang_en = Language(identifier='en')
@@ -85,8 +80,12 @@ def test_i18n_table_creation():
     foo = Foo()
     sess.add(foo)
 
-    # Commit so the above get primary keys filled in
+    # Commit so the above get primary keys filled in, then give the
+    # session the language id
     sess.commit()
+    # Note that this won't apply to sessions created in other threads, but that
+    # ought not be a problem!
+    sess.default_language_id = lang_en.id
 
     # Give our foo some names, as directly as possible
     foo_text = FooText()
@@ -175,6 +174,7 @@ def test_texts():
             good_formats = 'identifier latex'.split()
             assert_text = '%s is not language-specific'
         columns = sorted(cls.__table__.c, key=lambda c: c.name)
+        text_columns = []
         for column in columns:
             format = column.info.get('format', None)
             if format is not None:
@@ -187,6 +187,7 @@ def test_texts():
                     raise AssertionError('%s: identifier column name/type mismatch' % column)
                 if column.info.get('official', None) and format not in 'gametext plaintext':
                     raise AssertionError('%s: official text with bad format' % column)
+                text_columns.append(column)
             else:
                 if isinstance(column.type, (markdown.MarkdownColumn, tables.Unicode)):
                     raise AssertionError('%s: text column without format' % column)
@@ -194,6 +195,11 @@ def test_texts():
                 raise AssertionError('%s: non-plaintext name' % column)
             # No mention of English in the description
             assert 'English' not in column.info['description'], column
+        # If there's more than one text column in a translation table,
+        # they have to be nullable, to support missing translations
+        if hasattr(cls, 'local_language') and len(text_columns) > 1:
+            for column in text_columns:
+                assert column.nullable
 
 def test_identifiers_with_names():
     """Test that named tables have identifiers, and non-named tables don't