diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-11-09 21:34:59 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2008-11-09 21:34:59 +0000 |
| commit | e31c5326c4b59921821d98b5f9d04603b1aa03ab (patch) | |
| tree | 90edda70e64b8eb91ee282520552e28a48b3c344 /lib/sqlalchemy/databases | |
| parent | 0cff22720b4c60c1c305b5ab858c2f453cc66e34 (diff) | |
| download | sqlalchemy-e31c5326c4b59921821d98b5f9d04603b1aa03ab.tar.gz | |
flattened _get_from_objects() into a descriptor/class-bound attribute
Diffstat (limited to 'lib/sqlalchemy/databases')
| -rw-r--r-- | lib/sqlalchemy/databases/mssql.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py index 0ccad76ff..090958795 100644 --- a/lib/sqlalchemy/databases/mssql.py +++ b/lib/sqlalchemy/databases/mssql.py @@ -1016,9 +1016,9 @@ class MSSQLCompiler(compiler.DefaultCompiler): return self.process(expression._BinaryExpression(binary.right, binary.left, binary.operator), **kwargs) else: if (binary.operator in (operator.eq, operator.ne)) and ( - (isinstance(binary.left, expression._FromGrouping) and isinstance(binary.left.element, expression._SelectBaseMixin)) or \ - (isinstance(binary.right, expression._FromGrouping) and isinstance(binary.right.element, expression._SelectBaseMixin)) or \ - isinstance(binary.left, expression._SelectBaseMixin) or isinstance(binary.right, expression._SelectBaseMixin)): + (isinstance(binary.left, expression._FromGrouping) and isinstance(binary.left.element, expression._ScalarSelect)) or \ + (isinstance(binary.right, expression._FromGrouping) and isinstance(binary.right.element, expression._ScalarSelect)) or \ + isinstance(binary.left, expression._ScalarSelect) or isinstance(binary.right, expression._ScalarSelect)): op = binary.operator == operator.eq and "IN" or "NOT IN" return self.process(expression._BinaryExpression(binary.left, binary.right, op), **kwargs) return super(MSSQLCompiler, self).visit_binary(binary, **kwargs) diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index f46a4bd4e..9871f6e0e 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -679,10 +679,9 @@ class OracleDialect(default.DefaultDialect): class _OuterJoinColumn(sql.ClauseElement): __visit_name__ = 'outer_join_column' + def __init__(self, column): self.column = column - def _get_from_objects(self, **kwargs): - return [] class OracleCompiler(compiler.DefaultCompiler): """Oracle compiler modifies the lexical structure of Select |