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

issue 1412, common_filters and joins, thanks Felipe Merelles

Browse Source
This commit is contained in:
mdipierro
2013-03-28 14:44:32 -05:00
parent b9189771d0
commit 515e284c22
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.5-stable+timestamp.2013.03.25.15.26.55 Version 2.4.5-stable+timestamp.2013.03.28.14.43.50
gluon/dal.py
+4 -1
View File
@@ -1503,6 +1503,7 @@ class BaseAdapter(ConnectionPool):
raise SyntaxError('invalid select attribute: %s' % key) raise SyntaxError('invalid select attribute: %s' % key)
args_get = attributes.get args_get = attributes.get
tablenames = tables(query) tablenames = tables(query)
tablenames_for_common_filters = tablenames
for field in fields: for field in fields:
if isinstance(field, basestring) \ if isinstance(field, basestring) \
and REGEX_TABLE_DOT_FIELD.match(field): and REGEX_TABLE_DOT_FIELD.match(field):
@@ -1566,6 +1567,8 @@ class BaseAdapter(ConnectionPool):
dict.fromkeys(tables(t))) for t in joinon] dict.fromkeys(tables(t))) for t in joinon]
joinont = [t.first._tablename for t in joinon] joinont = [t.first._tablename for t in joinon]
[tables_to_merge.pop(t) for t in joinont if t in tables_to_merge] [tables_to_merge.pop(t) for t in joinont if t in tables_to_merge]
tablenames_for_common_filters = [t for t in tablenames
if not t in joinont ]
important_tablenames = joint + joinont + tables_to_merge.keys() important_tablenames = joint + joinont + tables_to_merge.keys()
excluded = [t for t in tablenames excluded = [t for t in tablenames
if not t in important_tablenames ] if not t in important_tablenames ]
@@ -1573,7 +1576,7 @@ class BaseAdapter(ConnectionPool):
excluded = tablenames excluded = tablenames
if use_common_filters(query): if use_common_filters(query):
query = self.common_filter(query,excluded) query = self.common_filter(query,tablenames_for_common_filters)
sql_w = ' WHERE ' + self.expand(query) if query else '' sql_w = ' WHERE ' + self.expand(query) if query else ''
def alias(t): def alias(t):