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

alternative solution to issue 1610, thanks Alan

Browse Source
This commit is contained in:
mdipierro
2013-08-07 08:53:05 -05:00
parent ae4d9dab10
commit 8e81e44b24
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.07.07.46.58 Version 2.6.0-development+timestamp.2013.08.07.08.52.17
gluon/dal.py
+15 -10
View File
@@ -194,7 +194,7 @@ CALLABLETYPES = (types.LambdaType, types.FunctionType,
TABLE_ARGS = set( TABLE_ARGS = set(
('migrate','primarykey','fake_migrate','format','redefine', ('migrate','primarykey','fake_migrate','format','redefine',
'singular','plural','trigger_name','sequence_name', 'singular','plural','trigger_name','sequence_name','fields',
'common_filter','polymodel','table_class','on_define','actual_name')) 'common_filter','polymodel','table_class','on_define','actual_name'))
SELECT_ARGS = set( SELECT_ARGS = set(
@@ -7766,6 +7766,8 @@ def index():
*fields, *fields,
**args **args
): ):
if not fields and 'fields' in args:
fields = args.get('fields',())
if not isinstance(tablename,str): if not isinstance(tablename,str):
raise SyntaxError("missing table name") raise SyntaxError("missing table name")
elif hasattr(self,tablename) or tablename in self.tables: elif hasattr(self,tablename) or tablename in self.tables:
@@ -8246,24 +8248,27 @@ class Table(object):
fieldnames.add('id') fieldnames.add('id')
self._id = field self._id = field
virtual_fields = [] virtual_fields = []
def include_new(field):
newfields.append(field)
fieldnames.add(field.name)
if field.type=='id':
self._id = field
for field in fields: for field in fields:
if isinstance(field, (FieldMethod, FieldVirtual)): if isinstance(field, (FieldMethod, FieldVirtual)):
virtual_fields.append(field) virtual_fields.append(field)
elif isinstance(field, Field) and not field.name in fieldnames: elif isinstance(field, Field) and not field.name in fieldnames:
if field.db is not None: if field.db is not None:
field = copy.copy(field) field = copy.copy(field)
newfields.append(field) include_new(field)
fieldnames.add(field.name) elif isinstance(field, dict) and 'fieldname' and \
if field.type=='id': not field['fieldname'] in fieldnames:
self._id = field include_new(Field(**field))
elif isinstance(field, Table): elif isinstance(field, Table):
table = field table = field
for field in table: for field in table:
if not field.name in fieldnames and not field.type=='id': if not field.name in fieldnames and not field.type=='id':
t2 = not table._actual and self._tablename t2 = not table._actual and self._tablename
field = field.clone(point_self_references_to=t2) include_new(field.clone(point_self_references_to=t2))
newfields.append(field)
fieldnames.add(field.name)
elif not isinstance(field, (Field, Table)): elif not isinstance(field, (Field, Table)):
raise SyntaxError( raise SyntaxError(
'define_table argument is not a Field or Table: %s' % field) 'define_table argument is not a Field or Table: %s' % field)