else: rejected.append(column)
return (fields,tags,rejected)
+ # compute the accepts part of an update method from a list of column names, and a (list of) fields dict
+ # use exclude=True to exclude the column names instead
+ @staticmethod
+ def accepted_fields (update_columns, fields, exclude=False):
+ if not isinstance(fields,list): fields = [fields]
+ result={}
+ for fields_dict in fields:
+ for (k,v) in fields_dict.iteritems():
+ if (not exclude and k in update_columns) or (exclude and k not in update_columns):
+ result[k]=v
+ return result
+
+ # filter out user-provided fields that are not part of the declared acceptance list
+ # this could maybe have been integrated in split_fields, but for simplicity we keep it aside
+ @staticmethod
+ def check_fields (user_dict, accepted_fields):
+# avoid the simple, but silent, version
+# return dict ([ (k,v) for (k,v) in user_dict.items() if k in accepted_fields ])
+ result={}
+ for (k,v) in user_dict.items():
+ if k in accepted_fields: result[k]=v
+ else: raise PLCInvalidArgument ('Trying to set/change unaccepted key %s'%k)
+ return result
+
# given a dict (typically passed to an Update method), we check and sort
# them against a list of dicts, e.g. [Node.fields, Node.related_fields]
# return is a list that contains n+1 dicts, last one has the rejected fields
result.append(rejected)
return result
- # compute the accepts part of an update method from a list of column names, and a (list of) fields dict
- @staticmethod
- def accepted_fields (can_update_columns, fields):
- result={}
- if not isinstance(fields,list): fields = [fields]
- for dict in fields:
- for (k,v) in dict.iteritems():
- if k in can_update_columns:
- result[k]=v
- return result
-
### class initialization : create tag-dependent cross view if needed
@classmethod
def tagvalue_view_name (cls, tagname):
(*) column 2: actual tag value, renamed into tagname
"""
- if not cls.view_tags_name: return ""
+ if not cls.view_tags_name:
+ raise Exception, 'WARNING: class %s needs to set view_tags_name'%cls.__name__
table_name=cls.table_name
primary_key=cls.primary_key
tag_columns={}
else:
(columns,tag_columns,rejected) = classobj.parse_columns(columns)
- if not columns:
+ if not columns and not tag_columns:
raise PLCInvalidArgument, "No valid return fields specified for class %s"%classobj.__name__
if rejected:
raise PLCInvalidArgument, "unknown column(s) specified %r in %s"%(rejected,classobj.__name__)