Compare commits
10 commits
8fb11fd269
...
756f0a8e5d
Author | SHA1 | Date | |
---|---|---|---|
![]() |
756f0a8e5d | ||
![]() |
6841f1444a | ||
![]() |
3ee47ed87f | ||
![]() |
8846e9b372 | ||
![]() |
ef941891e4 | ||
![]() |
f7c4a2c2df | ||
![]() |
2fd3f190af | ||
![]() |
c06909f5f4 | ||
![]() |
2edda5c7b4 | ||
![]() |
e1616260af |
3 changed files with 29 additions and 4 deletions
2
setup.py
2
setup.py
|
@ -66,7 +66,7 @@ specific version of this database, that version being 7.5.1.
|
||||||
packages = find_packages(),
|
packages = find_packages(),
|
||||||
|
|
||||||
install_requires = [
|
install_requires = [
|
||||||
'SQLAlchemy',
|
'SQLAlchemy>0.5.2',
|
||||||
],
|
],
|
||||||
|
|
||||||
entry_points = {
|
entry_points = {
|
||||||
|
|
|
@ -23,4 +23,4 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
|
||||||
__version__ = '0.1b1'
|
__version__ = '0.1b5'
|
||||||
|
|
|
@ -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):
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue