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

Merge pull request #427 from michele-comitini/sqltable_quoted_names_support

Browse Source 
apply same rules as DAL's to find tables and fields in column names
This commit is contained in:
mdipierro
2014-04-23 23:59:14 -05:00
parent 287d8e3e18 5f636c5ba2
commit a7434b3ce8
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/sqlhtml.py
+9 -5
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):
@@ -2914,13 +2913,14 @@ class SQLTABLE(TABLE):
(components, row) = (self.components, []) (components, row) = (self.components, [])
if not sqlrows: if not sqlrows:
return return
REGEX_TABLE_DOT_FIELD = sqlrows.db._adapter.REGEX_TABLE_DOT_FIELD
if not columns: if not columns:
REGEX_TABLE_DOT_FIELD = sqlrows.db._adapter.REGEX_TABLE_DOT_FIELD
columns = [c for c in sqlrows.colnames if REGEX_TABLE_DOT_FIELD.match(c)] columns = [c for c in sqlrows.colnames if REGEX_TABLE_DOT_FIELD.match(c)]
if headers == 'fieldname:capitalize': if headers == 'fieldname:capitalize':
headers = {} headers = {}
for c in columns: for c in columns:
headers[c] = c.split('.')[-1].replace('_', ' ').title() (t,f) = REGEX_TABLE_DOT_FIELD.match(c).groups()
headers[t + '.' + f] = f.replace('_', ' ').title()
elif headers == 'labels': elif headers == 'labels':
headers = {} headers = {}
for c in columns: for c in columns:
@@ -2939,6 +2939,7 @@ class SQLTABLE(TABLE):
headers = {} headers = {}
else: else:
for c in columns: # new implement dict for c in columns: # new implement dict
c = '.'.join(REGEX_TABLE_DOT_FIELD.match(c).groups())
if isinstance(headers.get(c, c), dict): if isinstance(headers.get(c, c), dict):
coldict = headers.get(c, c) coldict = headers.get(c, c)
attrcol = dict() attrcol = dict()
@@ -2977,7 +2978,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 +2988,8 @@ 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()
colname = tablename + '.' + fieldname
try: try:
field = sqlrows.db[tablename][fieldname] field = sqlrows.db[tablename][fieldname]
except (KeyError, AttributeError): except (KeyError, AttributeError):