Merge "Add sha1, sha256 support for blobs"

This commit is contained in:
Jenkins
2016-09-26 11:32:15 +00:00
committed by Gerrit Code Review
11 changed files with 159 additions and 100 deletions

View File

@@ -99,7 +99,9 @@ def upgrade():
sa.Column('artifact_id', sa.String(36),
sa.ForeignKey('glare_artifacts.id'), nullable=False),
sa.Column('size', sa.BigInteger()),
sa.Column('checksum', sa.String(32)),
sa.Column('md5', sa.String(32)),
sa.Column('sha1', sa.String(40)),
sa.Column('sha256', sa.String(64)),
sa.Column('name', sa.String(255), nullable=False),
sa.Column('status', sa.String(32), nullable=False),
sa.Column('external', sa.Boolean()),

View File

@@ -550,7 +550,7 @@ def _do_properties(artifact, new_properties):
def _update_blob_values(blob, values):
for elem in ('size', 'checksum', 'url', 'external', 'status',
for elem in ('size', 'md5', 'sha1', 'sha256', 'url', 'external', 'status',
'content_type'):
setattr(blob, elem, values[elem])
return blob

View File

@@ -81,7 +81,9 @@ def _parse_blob_value(blob):
"url": blob.url,
"status": blob.status,
"external": blob.external,
"checksum": blob.checksum,
"md5": blob.md5,
"sha1": blob.sha1,
"sha256": blob.sha256,
"size": blob.size,
"content_type": blob.content_type
}
@@ -222,7 +224,9 @@ class ArtifactBlob(BASE, ArtifactBase):
nullable=False)
name = Column(String(255), nullable=False)
size = Column(BigInteger().with_variant(Integer, "sqlite"))
checksum = Column(String(32))
md5 = Column(String(32))
sha1 = Column(String(40))
sha256 = Column(String(64))
external = Column(Boolean)
url = Column(Text)
status = Column(String(32), nullable=False)