vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	test/data/test.db
This commit is contained in:
jakedt 2014-02-21 14:52:40 -05:00
commit d5304f7db0
128 changed files with 845 additions and 207343 deletions
Download patch file Download diff file Expand all files Collapse all files

17
data/database.py
View file

@ -185,6 +185,15 @@ class EmailConfirmation(BaseModel):
created = DateTimeField(default=datetime.now)
class ImageStorage(BaseModel):
uuid = CharField(default=uuid_generator)
checksum = CharField(null=True)
created = DateTimeField(null=True)
comment = TextField(null=True)
command = TextField(null=True)
image_size = BigIntegerField(null=True)
class Image(BaseModel):
# This class is intentionally denormalized. Even though images are supposed
# to be globally unique we can't treat them as such for permissions and
@ -199,7 +208,9 @@ class Image(BaseModel):
image_size = BigIntegerField(null=True)
# '/' separated list of ancestory ids, e.g. /1/2/6/7/10/
ancestors = CharField(index=True, default='/', max_length=64535)
ancestors = CharField(index=True, default='/', max_length=64535, null=True)
storage = ForeignKeyField(ImageStorage, index=True, null=True)
class Meta:
database = db
@ -262,5 +273,5 @@ all_models = [User, Repository, Image, AccessToken, Role,
RepositoryPermission, Visibility, RepositoryTag,
EmailConfirmation, FederatedLogin, LoginService, QueueItem,
RepositoryBuild, Team, TeamMember, TeamRole, Webhook,
LogEntryKind, LogEntry, PermissionPrototype, BuildTriggerService,
RepositoryBuildTrigger]
LogEntryKind, LogEntry, PermissionPrototype, ImageStorage,
BuildTriggerService, RepositoryBuildTrigger]