rattail/sqlbase7-sa
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added outer join support...michael was right :)

Browse source 
And once again, thanks to Michael Bayer for forging the way on this one.
The Oracle dialect code was still pretty much copied directly over.
This commit is contained in:
Lance Edgar 2010-07-31 20:09:17 -05:00
parent 8846e9b372
commit 3ee47ed87f
1 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sqlbase7_sa/sqlbase7.py
View file

@ -26,6 +26,7 @@
from sqlalchemy.engine.default import DefaultDialect from sqlalchemy.engine.default import DefaultDialect
from sqlalchemy import types, and_ from sqlalchemy import types, and_
from sqlalchemy.sql.expression import Join from sqlalchemy.sql.expression import Join
from sqlalchemy.sql import visitors, operators, ClauseElement
import sqlalchemy import sqlalchemy
@ -56,7 +57,12 @@ class SQLBase7Compiler(CompilerBase):
return self.process(join.left, **kwargs) + ", " + self.process(join.right, **kwargs) return self.process(join.left, **kwargs) + ", " + self.process(join.right, **kwargs)
def visit_select(self, select, **kwargs): def visit_select(self, select, **kwargs):
froms = select._get_display_froms() if self.stack and 'from' in self.stack[-1]:
existingfroms = self.stack[-1]['from']
else:
existingfroms = None
froms = select._get_display_froms(existingfroms)
whereclause = self._get_join_whereclause(froms) whereclause = self._get_join_whereclause(froms)
if whereclause is not None: if whereclause is not None:
select = select.where(whereclause) select = select.where(whereclause)
@ -71,7 +77,16 @@ class SQLBase7Compiler(CompilerBase):
clauses = [] clauses = []
def visit_join(join): def visit_join(join):
clauses.append(join.onclause) if join.isouter:
def visit_binary(binary):
if binary.operator == operators.eq:
if binary.left.table is join.right:
binary.left = _OuterJoinColumn(binary.left)
elif binary.right.table is join.right:
binary.right = _OuterJoinColumn(binary.right)
clauses.append(visitors.cloned_traverse(join.onclause, {}, {'binary':visit_binary}))
else:
clauses.append(join.onclause)
for j in join.left, join.right: for j in join.left, join.right:
if isinstance(j, Join): if isinstance(j, Join):
visit_join(j) visit_join(j)
@ -84,6 +99,16 @@ class SQLBase7Compiler(CompilerBase):
return and_(*clauses) return and_(*clauses)
return None return None
def visit_outer_join_column(self, vc):
return self.process(vc.column) + "(+)"
class _OuterJoinColumn(ClauseElement):
__visit_name__ = 'outer_join_column'
def __init__(self, column):
self.column = column
class SQLBase7Dialect(DefaultDialect): class SQLBase7Dialect(DefaultDialect):