diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-09-28 19:10:22 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-09-28 19:10:22 +0000 |
| commit | 6122c3ad4802040a885f61ae97ecac03605057b4 (patch) | |
| tree | cf8d1b8bd6098c07a50596d9c7c67e33cb6fc2a6 /lib/sqlalchemy/sql/expression.py | |
| parent | 5f75197e86059d7e4bbe20558c98011d89f9cfda (diff) | |
| download | sqlalchemy-6122c3ad4802040a885f61ae97ecac03605057b4.tar.gz | |
- session.execute() will execute a Sequence object passed to
it (regression from 0.4).
- Removed the "raiseerror" keyword argument from object_mapper()
and class_mapper(). These functions raise in all cases
if the given class/instance is not mapped.
- Refined ExtensionCarrier to be itself a dict, removed
'methods' accessor
- moved identity_key tests to test/orm/utils.py
- some docstrings
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 81c9d3936..8f611c05e 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -880,7 +880,10 @@ def _compound_select(keyword, *selects, **kwargs): return CompoundSelect(keyword, *selects, **kwargs) def _is_literal(element): - return not isinstance(element, (ClauseElement, Operators)) + global schema + if not schema: + from sqlalchemy import schema + return not isinstance(element, (ClauseElement, Operators, schema.SchemaItem)) def _from_objects(*elements, **kwargs): return itertools.chain(*[element._get_from_objects(**kwargs) for element in elements]) |
