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

Fix a problem with initdb and add a limit to the builds API.

Browse source
This commit is contained in:
jakedt 2014-03-05 15:50:32 -05:00
parent 5f0969778e
commit fde96c736a
4 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
data/model.py
View file

@ -1395,7 +1395,7 @@ def load_token_data(code):
def get_repository_build(namespace_name, repository_name, build_uuid):
try:
query = list_repository_builds(namespace_name, repository_name)
query = list_repository_builds(namespace_name, repository_name, 1)
return query.where(RepositoryBuild.uuid == build_uuid).get()
except RepositoryBuild.DoesNotExist:
@ -1403,7 +1403,7 @@ def get_repository_build(namespace_name, repository_name, build_uuid):
raise InvalidRepositoryBuildException(msg)
def list_repository_builds(namespace_name, repository_name,
def list_repository_builds(namespace_name, repository_name, limit,
include_inactive=True):
query = (RepositoryBuild
.select(RepositoryBuild, RepositoryBuildTrigger, BuildTriggerService)
@ -1412,7 +1412,8 @@ def list_repository_builds(namespace_name, repository_name,
.join(RepositoryBuildTrigger, JOIN_LEFT_OUTER)
.join(BuildTriggerService, JOIN_LEFT_OUTER)
.where(Repository.name == repository_name,
Repository.namespace == namespace_name))
Repository.namespace == namespace_name)
.limit(limit))
if not include_inactive:
query = query.where(RepositoryBuild.phase != 'error',
@ -1537,11 +1538,6 @@ def list_build_triggers(namespace_name, repository_name):
def list_trigger_builds(namespace_name, repository_name, trigger_uuid,
limit=None):
query = (list_repository_builds(namespace_name, repository_name)
limit):
query = (list_repository_builds(namespace_name, repository_name, limit)
.where(RepositoryBuildTrigger.uuid == trigger_uuid))
if limit:
return query.limit(limit)
else:
return query