diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-05-14 22:25:36 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-05-14 22:25:36 +0000 |
| commit | ae4b954b1a6baf5a58c0e00e382196b581a7f06a (patch) | |
| tree | 562d969dcef857594a62e3730e1305aaa284e3b0 /lib/sqlalchemy/databases/oracle.py | |
| parent | 3de128138a896bc7373aa2684c920271c4781b7d (diff) | |
| download | sqlalchemy-ae4b954b1a6baf5a58c0e00e382196b581a7f06a.tar.gz | |
- parenthesis are applied to clauses via a new _Grouping construct.
uses operator precedence to more intelligently apply parenthesis
to clauses, provides cleaner nesting of clauses (doesnt mutate
clauses placed in other clauses, i.e. no 'parens' flag)
- added 'modifier' keyword, works like func.<foo> except does not
add parenthesis. e.g. select([modifier.DISTINCT(...)]) etc.
Diffstat (limited to 'lib/sqlalchemy/databases/oracle.py')
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index 0c1e2ff62..7e79a889f 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -441,7 +441,12 @@ class OracleCompiler(ansisql.ANSICompiler): return ansisql.ANSICompiler.visit_join(self, join) self.froms[join] = self.get_from_text(join.left) + ", " + self.get_from_text(join.right) - self.wheres[join] = sql.and_(self.wheres.get(join.left, None), join.onclause) + where = self.wheres.get(join.left, None) + if where is not None: + self.wheres[join] = sql.and_(where, join.onclause) + else: + self.wheres[join] = join.onclause +# self.wheres[join] = sql.and_(self.wheres.get(join.left, None), join.onclause) self.strings[join] = self.froms[join] if join.isouter: @@ -454,7 +459,7 @@ class OracleCompiler(ansisql.ANSICompiler): self._outertable = None - self.visit_compound(self.wheres[join]) + self.wheres[join].accept_visitor(self) def visit_insert_sequence(self, column, sequence, parameters): """This is the `sequence` equivalent to ``ANSICompiler``'s |