dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed join problem, issue 490, thanks Michele and Marin Pranjic

Browse Source
This commit is contained in:
Massimo DiPierro
2012-02-28 12:55:26 -06:00
parent 5c58d8a12e
commit 06ef404a01
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-02-28 11:18:01) stable Version 1.99.4 (2012-02-28 12:55:24) stable
gluon/dal.py
+18 -5
View File
@@ -1228,8 +1228,13 @@ class BaseAdapter(ConnectionPool):
inner_join = [inner_join] inner_join = [inner_join]
ijoint = [t._tablename for t in inner_join if not isinstance(t,Expression)] ijoint = [t._tablename for t in inner_join if not isinstance(t,Expression)]
ijoinon = [t for t in inner_join if isinstance(t, Expression)] ijoinon = [t for t in inner_join if isinstance(t, Expression)]
itables_to_merge={} #issue 490
[itables_to_merge.update(dict.fromkeys(self.tables(t))) for t in ijoinon] # issue 490
ijoinont = [t.first._tablename for t in ijoinon] ijoinont = [t.first._tablename for t in ijoinon]
iexcluded = [t for t in tablenames if not t in ijoint + ijoinont] [itables_to_merge.pop(t) for t in ijoinont if t in itables_to_merge] #issue 490
iimportant_tablenames = ijoint + ijoinont + itables_to_merge.keys() # issue 490
#iexcluded = [t for t in tablenames if not t in ijoint + ijoinont] ## issue 490
iexcluded = [t for t in tablenames if not t in iimportant_tablenames]
if left: if left:
join = attributes['left'] join = attributes['left']
command = self.LEFT_JOIN() command = self.LEFT_JOIN()
@@ -1247,7 +1252,8 @@ class BaseAdapter(ConnectionPool):
def alias(t): def alias(t):
return str(self.db[t]) return str(self.db[t])
if inner_join and not left: if inner_join and not left:
sql_t = ', '.join(alias(t) for t in iexcluded) #sql_t = ', '.join(alias(t) for t in iexcluded) ## issue 490
sql_t = ', '.join([alias(t) for t in iexcluded + itables_to_merge.keys()]) # issue 490
for t in ijoinon: for t in ijoinon:
sql_t += ' %s %s' % (icommand, str(t)) sql_t += ' %s %s' % (icommand, str(t))
elif not inner_join and left: elif not inner_join and left:
@@ -1257,8 +1263,14 @@ class BaseAdapter(ConnectionPool):
for t in joinon: for t in joinon:
sql_t += ' %s %s' % (command, str(t)) sql_t += ' %s %s' % (command, str(t))
elif inner_join and left: elif inner_join and left:
sql_t = ','.join([alias(t) for t in excluded + \ #sql_t = ','.join([alias(t) for t in excluded + \
tables_to_merge.keys() if t in iexcluded ]) # tables_to_merge.keys() if t in iexcluded ]) ## issue 490
all_tables_in_query = set(important_tablenames + \
iimportant_tablenames + \
tablenames) # issue 490
tables_in_joinon = set(joinont + ijoinont) # issue 490
tables_not_in_joinon = all_tables_in_query.difference(tables_in_joinon) # issue 490
sql_t = ','.join([alias(t) for t in tables_not_in_joinon]) # issue 490
for t in ijoinon: for t in ijoinon:
sql_t += ' %s %s' % (icommand, str(t)) sql_t += ' %s %s' % (icommand, str(t))
if joint: if joint:
@@ -7339,7 +7351,8 @@ def xorify(orderby):
return orderby2 return orderby2
def use_common_filters(query): def use_common_filters(query):
return (query and hasattr(query,'ignore_common_filters') and not query.ignore_common_filters) return (query and hasattr(query,'ignore_common_filters') and \
not query.ignore_common_filters)
class Set(object): class Set(object):