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

Fix more things for the systems table introduction

Browse source
This commit is contained in:
Christopher Baines 2021-04-23 23:10:28 +01:00
parent c252d1cb30
commit 1f078e1af0
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guix-data-service/builds.scm
View file

@ -572,12 +572,14 @@ WHERE derivation_output_details_set_id NOT IN (
) AND derivation_output_details_set_id IN ( ) AND derivation_output_details_set_id IN (
SELECT derivation_output_details_set_id SELECT derivation_output_details_set_id
FROM package_derivations FROM package_derivations
INNER JOIN systems
ON package_derivations.system_id = systems.id
INNER JOIN derivations_by_output_details_set INNER JOIN derivations_by_output_details_set
ON package_derivations.derivation_id = ON package_derivations.derivation_id =
derivations_by_output_details_set.derivation_id derivations_by_output_details_set.derivation_id
INNER JOIN build_servers_build_config INNER JOIN build_servers_build_config
ON build_servers_build_config.build_server_id = $1 ON build_servers_build_config.build_server_id = $1
AND build_servers_build_config.system = package_derivations.system AND build_servers_build_config.system = systems.system
AND build_servers_build_config.target = package_derivations.target AND build_servers_build_config.target = package_derivations.target
" "
(if (null? revision-commits) (if (null? revision-commits)
@ -623,12 +625,14 @@ WHERE NOT EXISTS (
) AND derivation_output_details_sets.id IN ( ) AND derivation_output_details_sets.id IN (
SELECT derivation_output_details_set_id SELECT derivation_output_details_set_id
FROM package_derivations FROM package_derivations
INNER JOIN systems
ON package_derivations.system_id = systems.id
INNER JOIN derivations_by_output_details_set INNER JOIN derivations_by_output_details_set
ON package_derivations.derivation_id = ON package_derivations.derivation_id =
derivations_by_output_details_set.derivation_id derivations_by_output_details_set.derivation_id
INNER JOIN build_servers_build_config INNER JOIN build_servers_build_config
ON build_servers_build_config.build_server_id = $1 ON build_servers_build_config.build_server_id = $1
AND build_servers_build_config.system = package_derivations.system AND build_servers_build_config.system = systems.system
AND build_servers_build_config.target = package_derivations.target AND build_servers_build_config.target = package_derivations.target
" "
(if (null? revision-commits) (if (null? revision-commits)
@ -646,7 +650,7 @@ WHERE NOT EXISTS (
(if systems (if systems
(string-append (string-append
" "
AND package_derivations.system IN (" AND systems.system IN ("
(string-join (string-join
(map quote-string systems) (map quote-string systems)
",") ",")

10
guix-data-service/comparison.scm
View file

@ -264,7 +264,7 @@ GROUP BY derivation_source_files.store_path"))
(string-append (string-append
(if systems (if systems
(string-append (string-append
" AND package_derivations.system IN (" " AND systems.system IN ("
(string-join (map (string-join (map
(lambda (s) (lambda (s)
(string-append "'" s "'")) (string-append "'" s "'"))
@ -287,11 +287,13 @@ GROUP BY derivation_source_files.store_path"))
(string-append " (string-append "
WITH base_packages AS ( WITH base_packages AS (
SELECT packages.*, derivations.id AS derivation_id, derivations.file_name, SELECT packages.*, derivations.id AS derivation_id, derivations.file_name,
package_derivations.system, package_derivations.target, systems.system, package_derivations.target,
derivations_by_output_details_set.derivation_output_details_set_id derivations_by_output_details_set.derivation_output_details_set_id
FROM packages FROM packages
INNER JOIN package_derivations INNER JOIN package_derivations
ON packages.id = package_derivations.package_id ON packages.id = package_derivations.package_id
INNER JOIN systems
ON package_derivations.system_id = systems.id
INNER JOIN derivations INNER JOIN derivations
ON package_derivations.derivation_id = derivations.id ON package_derivations.derivation_id = derivations.id
INNER JOIN derivations_by_output_details_set INNER JOIN derivations_by_output_details_set
@ -303,11 +305,13 @@ WITH base_packages AS (
)" extra-constraints " )" extra-constraints "
), target_packages AS ( ), target_packages AS (
SELECT packages.*, derivations.id AS derivation_id, derivations.file_name, SELECT packages.*, derivations.id AS derivation_id, derivations.file_name,
package_derivations.system, package_derivations.target, systems.system, package_derivations.target,
derivations_by_output_details_set.derivation_output_details_set_id derivations_by_output_details_set.derivation_output_details_set_id
FROM packages FROM packages
INNER JOIN package_derivations INNER JOIN package_derivations
ON packages.id = package_derivations.package_id ON packages.id = package_derivations.package_id
INNER JOIN systems
ON package_derivations.system_id = systems.id
INNER JOIN derivations INNER JOIN derivations
ON package_derivations.derivation_id = derivations.id ON package_derivations.derivation_id = derivations.id
INNER JOIN derivations_by_output_details_set INNER JOIN derivations_by_output_details_set