cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some queries relating to the build_status table changes

Browse source
This commit is contained in:
Christopher Baines 2019-11-28 19:32:00 +00:00
parent af1324855e
commit 20c75e1103
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
guix-data-service/model/derivation.scm
View file

@ -95,13 +95,13 @@ INNER JOIN guix_revision_package_derivations
ON package_derivations.id = guix_revision_package_derivations.package_derivation_id ON package_derivations.id = guix_revision_package_derivations.package_derivation_id
INNER JOIN guix_revisions INNER JOIN guix_revisions
ON guix_revision_package_derivations.revision_id = guix_revisions.id ON guix_revision_package_derivations.revision_id = guix_revisions.id
LEFT OUTER JOIN builds ON derivations.id = builds.derivation_id LEFT OUTER JOIN builds ON derivations.file_name = builds.derivation_file_name
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (internal_build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY internal_build_id, status_fetched_at DESC ORDER BY build_id, timestamp DESC
) AS latest_build_status ) AS latest_build_status
ON builds.internal_id = latest_build_status.internal_build_id ON builds.id = latest_build_status.build_id
WHERE guix_revisions.commit = $1 WHERE guix_revisions.commit = $1
AND packages.name = $2 AND packages.name = $2
AND packages.version = $3 AND packages.version = $3
@ -569,13 +569,13 @@ FROM derivations
INNER JOIN package_derivations INNER JOIN package_derivations
ON derivations.id = package_derivations.derivation_id ON derivations.id = package_derivations.derivation_id
LEFT OUTER JOIN builds LEFT OUTER JOIN builds
ON derivations.id = builds.derivation_id ON derivations.file_name = builds.derivation_file_name
LEFT OUTER JOIN ( LEFT OUTER JOIN (
SELECT DISTINCT ON (internal_build_id) * SELECT DISTINCT ON (build_id) *
FROM build_status FROM build_status
ORDER BY internal_build_id, status_fetched_at DESC ORDER BY build_id, timestamp DESC
) AS latest_build_status ) AS latest_build_status
ON builds.internal_id = latest_build_status.internal_build_id ON builds.id = latest_build_status.build_id
WHERE " criteria ";")) WHERE " criteria ";"))
(exec-query conn query)) (exec-query conn query))