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

apply same rules as DAL's to find tables and fields in column names

Browse Source
This commit is contained in:
Michele Comitini
2014-04-23 09:45:22 +02:00
parent 287d8e3e18
commit dcd92daa24
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+4 -3
View File
@@ -43,7 +43,6 @@ try:
except ImportError: except ImportError:
is_gae = False # this is an assumption (if settings missing) is_gae = False # this is an assumption (if settings missing)
table_field = re.compile('[\w_]+\.[\w_]+')
widget_class = re.compile('^\w*') widget_class = re.compile('^\w*')
def add_class(a,b): def add_class(a,b):
@@ -2977,7 +2976,9 @@ class SQLTABLE(TABLE):
_class += ' rowselected' _class += ' rowselected'
for colname in columns: for colname in columns:
if not table_field.match(colname): matched_column_field = \
sqlrows.db._adapter.REGEX_TABLE_DOT_FIELD.match(colname)
if not matched_column_field:
if "_extra" in record and colname in record._extra: if "_extra" in record and colname in record._extra:
r = record._extra[colname] r = record._extra[colname]
row.append(TD(r)) row.append(TD(r))
@@ -2985,7 +2986,7 @@ class SQLTABLE(TABLE):
else: else:
raise KeyError( raise KeyError(
"Column %s not found (SQLTABLE)" % colname) "Column %s not found (SQLTABLE)" % colname)
(tablename, fieldname) = colname.split('.') (tablename, fieldname) = matched_column_field.groups()
try: try:
field = sqlrows.db[tablename][fieldname] field = sqlrows.db[tablename][fieldname]
except (KeyError, AttributeError): except (KeyError, AttributeError):