diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-03-29 00:00:49 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-03-29 00:00:49 +0000 |
commit | c4955c05a3ab40d53c83982da612e746c662640d (patch) | |
tree | c979c566711917679c9fa5d31b6dbcdb1c76eb34 /test/testlib/testing.py | |
parent | 30020880d90ee2f983b8e6bfb1624349209dd8b0 (diff) | |
download | sqlalchemy-c4955c05a3ab40d53c83982da612e746c662640d.tar.gz |
- merged with_polymorphic branch, which was merged with query_columns branch
- removes everything to do with select_table, which remains as a keyword argument synonymous with
with_polymorphic=('*', select_table).
- all "polymorphic" selectables find their way to Query by way of _set_select_from() now, so that
all joins/aliasing/eager loads/etc. is handled consistently. Mapper has methods for producing
polymorphic selectables so that Query and eagerloaders alike can get to them.
- row aliasing simplified, so that they don't need to nest. they only need the source selectable
and adapt to whatever incoming columns they get.
- Query is more egalitarian about mappers/columns now. Still has a strong sense of "entity zero",
but also introduces new unpublished/experimental _values() method which sets up a columns-only query.
- Query.order_by() and Query.group_by() take *args now (also still take a list, will likely deprecate
in 0.5). May want to do this for select() as well.
- the existing "check for False discriminiator" "fix" was not working completely, added coverage
- orphan detection was broken when the target object was a subclass of the mapper with the orphaned
relation, fixed that too.
Diffstat (limited to 'test/testlib/testing.py')
-rw-r--r-- | test/testlib/testing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/testlib/testing.py b/test/testlib/testing.py index 08c3c9192..69b5d8fed 100644 --- a/test/testlib/testing.py +++ b/test/testlib/testing.py @@ -468,9 +468,9 @@ class TestBase(unittest.TestCase): """overridden to not return docstrings""" return None - def assertRaisesMessage(self, except_cls, msg, callable_, ): + def assertRaisesMessage(self, except_cls, msg, callable_, *args, **kwargs): try: - callable_() + callable_(*args, **kwargs) assert False, "Callable did not raise expected exception" except except_cls, e: assert re.search(msg, str(e)), "Exception message did not match: '%s'" % str(e) |