Merge remote-tracking branch 'upstream/master' into python-registry-v2

data/database.py

@@ -123,6 +123,7 @@ db = Proxy()
 read_slave = Proxy()
 db_random_func = CallableProxy()
 db_for_update = CallableProxy()
+db_transaction = CallableProxy()
 
 
 def validate_database_url(url, db_kwargs, connect_timeout=5):
@@ -168,6 +169,10 @@ def configure(config_object):
   if read_slave_uri is not None:
     read_slave.initialize(_db_from_url(read_slave_uri, db_kwargs))
 
+  def _db_transaction():
+    return config_object['DB_TRANSACTION_FACTORY'](db)
+
+  db_transaction.initialize(_db_transaction)
 
 def random_string_generator(length=16):
   def random_string():
@@ -377,14 +382,15 @@ class Repository(BaseModel):
       return sorted_models.index(cmp_fk.model_class.__name__)
     filtered_ops.sort(key=sorted_model_key)
 
-    for query, fk in filtered_ops:
-      model = fk.model_class
-      if fk.null and not delete_nullable:
-        model.update(**{fk.name: None}).where(query).execute()
-      else:
-        model.delete().where(query).execute()
+    with db_transaction():
+      for query, fk in filtered_ops:
+        model = fk.model_class
+        if fk.null and not delete_nullable:
+          model.update(**{fk.name: None}).where(query).execute()
+        else:
+          model.delete().where(query).execute()
 
-    return self.delete().where(self._pk_expr()).execute()
+      return self.delete().where(self._pk_expr()).execute()
 
 class Star(BaseModel):
   user = ForeignKeyField(User, index=True)
@@ -469,6 +475,9 @@ class RepositoryBuildTrigger(BaseModel):
   pull_robot = QuayUserField(allows_robots=True, null=True, related_name='triggerpullrobot',
                              robot_null_delete=True)
 
+  # TODO(jschorr): Remove this column once we verify the backfill has succeeded.
+  used_legacy_github = BooleanField(null=True, default=False)
+
 
 class EmailConfirmation(BaseModel):
   code = CharField(default=random_string_generator(), unique=True, index=True)
@@ -778,6 +787,33 @@ class BlobUpload(BaseModel):
     )
 
 
+class QuayService(BaseModel):
+  name = CharField(index=True, unique=True)
+
+
+class QuayRegion(BaseModel):
+  name = CharField(index=True, unique=True)
+
+
+class QuayRelease(BaseModel):
+  service = ForeignKeyField(QuayService)
+  version = CharField()
+  region = ForeignKeyField(QuayRegion)
+  reverted = BooleanField(default=False)
+  created = DateTimeField(default=datetime.now, index=True)
+
+  class Meta:
+    database = db
+    read_slaves = (read_slave,)
+    indexes = (
+      # unique release per region
+      (('service', 'version', 'region'), True),
+
+      # get recent releases
+      (('service', 'region', 'created'), False),
+    )
+
+
 all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission, Visibility,
               RepositoryTag, EmailConfirmation, FederatedLogin, LoginService, QueueItem,
               RepositoryBuild, Team, TeamMember, TeamRole, LogEntryKind, LogEntry,
@@ -787,4 +823,5 @@ all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission,
               ExternalNotificationEvent, ExternalNotificationMethod, RepositoryNotification,
               RepositoryAuthorizedEmail, ImageStorageTransformation, DerivedImageStorage,
               TeamMemberInvite, ImageStorageSignature, ImageStorageSignatureKind,
-              AccessTokenKind, Star, RepositoryActionCount, TagManifest, BlobUpload, UserRegion]
+              AccessTokenKind, Star, RepositoryActionCount, TagManifest, UserRegion,
+              QuayService, QuayRegion, QuayRelease, BlobUpload]