- sql += "SELECT %s FROM foreign_nodes, peers " % ", ".join(fields)
- sql += "WHERE foreign_nodes.peer_id=peers.peer_id "
- sql += "AND foreign_nodes.deleted IS False "
-
- if foreign_node_id_or_peername_list:
- foreign_node_id_list = [ x for x in foreign_node_id_or_peername_list if isinstance(x, (int,long))]
- peername_list = [ x for x in foreign_node_id_or_peername_list if isinstance(x, StringTypes)]
+ sql += "SELECT %s FROM foreign_nodes " % ", ".join(ForeignNode.fields)
+ sql += "WHERE foreign_nodes.deleted IS False "
+
+ if foreign_node_id_or_hostname_list:
+ foreign_node_id_list = [ str(x) for x in foreign_node_id_or_hostname_list
+ if isinstance(x, (int,long))]
+ hostname_list = [ x for x in foreign_node_id_or_hostname_list
+ if isinstance(x, StringTypes)]