database.
"""
- def __init__(self, api, address_filter = None):
- Table.__init__(self, api, Address)
+ def __init__(self, api, address_filter = None, columns = None):
+ Table.__init__(self, api, Address, columns)
sql = "SELECT %s FROM view_addresses WHERE True" % \
- ", ".join(Address.fields)
+ ", ".join(self.columns)
if address_filter is not None:
- if isinstance(address_filter, (list, tuple, set)):
+ if isinstance(address_filter, (list, tuple, set, int)):
address_filter = Filter(Address.fields, {'address_id': address_filter})
elif isinstance(address_filter, dict):
address_filter = Filter(Address.fields, address_filter)
- sql += " AND (%s)" % address_filter.sql(api)
+ sql += " AND (%s) %s" % address_filter.sql(api)
self.selectall(sql)