diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-23 06:35:27 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-23 06:35:27 +0000 |
| commit | 26ec8e13fa80f23e5ad8ee3a84065bc5f50d057f (patch) | |
| tree | 171986f6810baf486980bbb33bcf4f3fd6fa0116 /lib/sqlalchemy | |
| parent | 05e5405051fed09597ec7ab9f41bc14aecdc4839 (diff) | |
| download | sqlalchemy-26ec8e13fa80f23e5ad8ee3a84065bc5f50d057f.tar.gz | |
added oracle8 test target, sets use_ansi to false
got mapper, objectstore, inheritance unittest working with oracle8, tweaks to join syntax
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index 68e6ea175..4736a2dda 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -233,14 +233,13 @@ class OracleCompiler(ansisql.ANSICompiler): if join.isouter: # if outer join, push on the right side table as the current "outertable" - outertable = self._outertable self._outertable = join.right # now re-visit the onclause, which will be used as a where clause # (the first visit occured via the Join object itself right before it called visit_join()) join.onclause.accept_visitor(self) - self._outertable = outertable + self._outertable = None self.visit_compound(self.wheres[join]) @@ -250,13 +249,9 @@ class OracleCompiler(ansisql.ANSICompiler): self.strings[alias] = self.get_str(alias.original) def visit_column(self, column): - if self._use_ansi: - return ansisql.ANSICompiler.visit_column(self, column) - - if column.table is self._outertable: - self.strings[column] = "%s.%s(+)" % (column.table.name, column.name) - else: - self.strings[column] = "%s.%s" % (column.table.name, column.name) + ansisql.ANSICompiler.visit_column(self, column) + if not self._use_ansi and self._outertable is not None and column.table is self._outertable: + self.strings[column] = self.strings[column] + "(+)" def visit_insert(self, insert): """inserts are required to have the primary keys be explicitly present. |
