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

fixed issue 440, reference to primary keys

Browse Source
This commit is contained in:
mdipierro
2012-12-05 11:35:23 -06:00
parent 7e4c533357
commit 32823d8288
2 changed files with 2 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.3.0 (2012-12-05 11:22:29) rc1 Version 2.3.0 (2012-12-05 11:34:39) rc1
gluon/dal.py
+1 -1
View File
@@ -8545,7 +8545,7 @@ class Field(Expression):
if not isinstance(fieldname,str) or hasattr(Table,fieldname) or \ if not isinstance(fieldname,str) or hasattr(Table,fieldname) or \
fieldname[0] == '_' or REGEX_PYTHON_KEYWORDS.match(fieldname): fieldname[0] == '_' or REGEX_PYTHON_KEYWORDS.match(fieldname):
raise SyntaxError('Field: invalid field name: %s' % fieldname) raise SyntaxError('Field: invalid field name: %s' % fieldname)
self.type = type if not isinstance(type, Table) else 'reference %s' % type self.type = type if not isinstance(type, (Table,Field)) else 'reference %s' % type
self.length = length if not length is None else DEFAULTLENGTH.get(self.type,512) self.length = length if not length is None else DEFAULTLENGTH.get(self.type,512)
self.default = default if default!=DEFAULT else (update or None) self.default = default if default!=DEFAULT else (update or None)
self.required = required # is this field required self.required = required # is this field required