Accidental refactor, split out legacy.py into separate sumodules and update all call sites.

data/database.py

@@ -80,6 +80,41 @@ class UseThenDisconnect(object):
     close_db_filter(None)
 
 
+class TupleSelector(object):
+  """ Helper class for selecting tuples from a peewee query and easily accessing
+      them as if they were objects.
+  """
+  class _TupleWrapper(object):
+    def __init__(self, data, fields):
+      self._data = data
+      self._fields = fields
+
+    def get(self, field):
+      return self._data[self._fields.index(TupleSelector.tuple_reference_key(field))]
+
+  @classmethod
+  def tuple_reference_key(cls, field):
+    """ Returns a string key for referencing a field in a TupleSelector. """
+    if field._node_type == 'func':
+      return field.name + ','.join([cls.tuple_reference_key(arg) for arg in field.arguments])
+
+    if field._node_type == 'field':
+      return field.name + ':' + field.model_class.__name__
+
+    raise Exception('Unknown field type %s in TupleSelector' % field._node_type)
+
+  def __init__(self, query, fields):
+    self._query = query.select(*fields).tuples()
+    self._fields = [TupleSelector.tuple_reference_key(field) for field in fields]
+
+  def __iter__(self):
+    return self._build_iterator()
+
+  def _build_iterator(self):
+    for tuple_data in self._query:
+      yield TupleSelector._TupleWrapper(tuple_data, self._fields)
+
+
 db = Proxy()
 read_slave = Proxy()
 db_random_func = CallableProxy()
@@ -216,6 +251,10 @@ class User(BaseModel):
     else:
       super(User, self).delete_instance(recursive=recursive, delete_nullable=delete_nullable)
 
+
+Namespace = User.alias()
+
+
 class TeamRole(BaseModel):
   name = CharField(index=True)
 
@@ -313,6 +352,9 @@ class Repository(BaseModel):
     dependencies = defaultdict(set)
 
     for query, fk in ops:
+      # We only want to skip transitive deletes, which are done using subqueries in the form of
+      # DELETE FROM <table> in <subquery>. If an op is not using a subquery, we allow it to be
+      # applied directly.
       if fk.model_class not in skip_transitive_deletes or query.op != 'in':
         filtered_ops.append((query, fk))