Compare commits

..

10 commits

Author SHA1 Message Date
Lance Edgar
756f0a8e5d bumped version 2010-07-31 20:15:49 -05:00
Lance Edgar
6841f1444a Added tag v0.1b4 for changeset 12904bc2d1e5 2010-07-31 20:09:44 -05:00
Lance Edgar
3ee47ed87f added outer join support...michael was right :)
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.
2010-07-31 20:09:17 -05:00
Lance Edgar
8846e9b372 bumped version 2010-06-25 13:01:15 -05:00
Lance Edgar
ef941891e4 Added tag v0.1b3 for changeset faf1f77492bb 2010-06-25 12:59:04 -05:00
Lance Edgar
f7c4a2c2df bumped sqlalchemy requirement
It's been discovered that SQLAlchemy 0.5.2 won't work; some problem with joining the sales log tables.
2010-06-25 12:58:34 -05:00
Lance Edgar
2fd3f190af Bumped version to 0.1b3. 2010-05-28 11:29:49 -05:00
Lance Edgar
c06909f5f4 Added tag v0.1b2 for changeset 610c63f302f7 2010-05-28 11:29:34 -05:00
Lance Edgar
2edda5c7b4 Bumped version to 0.1b2. 2010-05-28 10:34:59 -05:00
Lance Edgar
e1616260af Added tag v0.1b1 for changeset fa58f0f4ac2c 2010-05-28 10:34:37 -05:00
3 changed files with 29 additions and 4 deletions

View file

@ -66,7 +66,7 @@ specific version of this database, that version being 7.5.1.
packages = find_packages(),
install_requires = [
'SQLAlchemy',
'SQLAlchemy>0.5.2',
],
entry_points = {

View file

@ -23,4 +23,4 @@
################################################################################
__version__ = '0.1b1'
__version__ = '0.1b5'

View file

@ -26,6 +26,7 @@
from sqlalchemy.engine.default import DefaultDialect
from sqlalchemy import types, and_
from sqlalchemy.sql.expression import Join
from sqlalchemy.sql import visitors, operators, ClauseElement
import sqlalchemy
@ -56,7 +57,12 @@ class SQLBase7Compiler(CompilerBase):
return self.process(join.left, **kwargs) + ", " + self.process(join.right, **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)
if whereclause is not None:
select = select.where(whereclause)
@ -71,7 +77,16 @@ class SQLBase7Compiler(CompilerBase):
clauses = []
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:
if isinstance(j, Join):
visit_join(j)
@ -84,6 +99,16 @@ class SQLBase7Compiler(CompilerBase):
return and_(*clauses)
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):