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

blob_decode bug fix, issue 657, thanks hi21alt

Browse Source
This commit is contained in:
Massimo DiPierro
2012-02-28 10:57:23 -06:00
parent f9dd893fb1
commit 9e4930243c
2 changed files with 9 additions and 4 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 10:47:48) stable Version 1.99.4 (2012-02-28 10:57:21) stable
gluon/dal.py
+8 -3
View File
@@ -1487,6 +1487,8 @@ class BaseAdapter(ConnectionPool):
return value return value
elif field_type in ('string', 'text', 'password', 'upload'): elif field_type in ('string', 'text', 'password', 'upload'):
return value return value
elif field_type == 'blob' and not blob_decode:
return value
else: else:
key = regex_type.match(field_type).group(0) key = regex_type.match(field_type).group(0)
return self.parsemap[key](value,field_type) return self.parsemap[key](value,field_type)
@@ -1592,8 +1594,10 @@ class BaseAdapter(ConnectionPool):
if not regex_table_field.match(colnames[j]): if not regex_table_field.match(colnames[j]):
if not '_extra' in new_row: if not '_extra' in new_row:
new_row['_extra'] = Row() new_row['_extra'] = Row()
new_row['_extra'][colnames[j]] = self.parse_value(value, fields[j].type) new_row['_extra'][colnames[j]] = \
new_column_name = regex_select_as_parser.search(colnames[j]) self.parse_value(value, fields[j].type,blob_decode)
new_column_name = \
regex_select_as_parser.search(colnames[j])
if not new_column_name is None: if not new_column_name is None:
column_name = new_column_name.groups(0) column_name = new_column_name.groups(0)
setattr(new_row,column_name[0],value) setattr(new_row,column_name[0],value)
@@ -1607,7 +1611,8 @@ class BaseAdapter(ConnectionPool):
virtualtables.append(tablename) virtualtables.append(tablename)
else: else:
colset = new_row[tablename] colset = new_row[tablename]
colset[fieldname] = value = self.parse_value(value,field.type) colset[fieldname] = value = \
self.parse_value(value,field.type,blob_decode)
if field.type == 'id': if field.type == 'id':
id = value id = value