Merge remote-tracking branch 'origin/master' into nomenclature

Conflicts:
	test/data/test.db
	workers/dockerfilebuild.py

data/model/legacy.py

@@ -1239,8 +1239,7 @@ def get_storage_by_uuid(storage_uuid):
   return found
 
 
-def set_image_size(docker_image_id, namespace_name, repository_name,
-                   image_size):
+def set_image_size(docker_image_id, namespace_name, repository_name, image_size, uncompressed_size):
   try:
     image = (Image
              .select(Image, ImageStorage)
@@ -1249,18 +1248,15 @@ def set_image_size(docker_image_id, namespace_name, repository_name,
              .switch(Image)
              .join(ImageStorage, JOIN_LEFT_OUTER)
              .where(Repository.name == repository_name, Namespace.username == namespace_name,
-                   Image.docker_image_id == docker_image_id)
+                    Image.docker_image_id == docker_image_id)
              .get())
 
   except Image.DoesNotExist:
     raise DataModelException('No image with specified id and repository')
 
-  if image.storage and image.storage.id:
-    image.storage.image_size = image_size
-    image.storage.save()
-  else:
-    image.image_size = image_size
-    image.save()
+  image.storage.image_size = image_size
+  image.storage.uncompressed_size = uncompressed_size
+  image.storage.save()
 
   return image
 

data/model/sqlalchemybridge.py

@@ -17,7 +17,12 @@ OPTION_TRANSLATIONS = {
 
 
 def gen_sqlalchemy_metadata(peewee_model_list):
-  metadata = MetaData()
+  metadata = MetaData(naming_convention={
+    "ix": 'ix_%(column_0_label)s',
+    "uq": "uq_%(table_name)s_%(column_0_name)s",
+    "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
+    "pk": "pk_%(table_name)s"
+  })
 
   for model in peewee_model_list:
     meta = model._meta