- if role_id_or_name_list:
- # Separate the list into integers and strings
- role_ids = filter(lambda role_id: isinstance(role_id, (int, long)),
- role_id_or_name_list)
- names = filter(lambda name: isinstance(name, StringTypes),
- role_id_or_name_list)
- sql += " WHERE (False"
- if role_ids:
- sql += " OR role_id IN (%s)" % ", ".join(map(str, role_ids))
- if names:
- sql += " OR name IN (%s)" % ", ".join(api.db.quote(names))
- sql += ")"
-
- rows = api.db.selectall(sql)
-
- for row in rows:
- self[row['role_id']] = Role(api, row)
+ if role_filter is not None:
+ if isinstance(role_filter, (list, tuple, set)):
+ # Separate the list into integers and strings
+ ints = filter(lambda x: isinstance(x, (int, long)), role_filter)
+ strs = filter(lambda x: isinstance(x, StringTypes), role_filter)
+ role_filter = Filter(Role.fields, {'role_id': ints, 'name': strs})
+ sql += " AND (%s) %s" % role_filter.sql(api, "OR")
+ elif isinstance(role_filter, dict):
+ role_filter = Filter(Role.fields, role_filter)
+ sql += " AND (%s) %s" % role_filter.sql(api, "AND")
+
+ self.selectall(sql)