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

Fall back to en_US.utf8 in the package page

Browse source 
Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Danjela Lura 2020-06-05 19:45:59 +02:00 • committed by Christopher Baines
parent d10c6f5aa9
commit 533bf91ab1
1 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

33
guix-data-service/model/lint-warning.scm
View file

@ -145,18 +145,35 @@ INNER JOIN lint_warning_messages
#:key #:key
locale) locale)
(define query (define query
"SELECT lint_warnings.id, lint_checkers.name, lint_checker_descriptions.description, "SELECT DISTINCT ON (lint_warnings.id) lint_warnings.id,
lint_checkers.name, translated_lint_checker_descriptions.description,
lint_checkers.network_dependent, lint_checkers.network_dependent,
locations.file, locations.line, locations.column_number, locations.file, locations.line, locations.column_number,
lint_warning_messages.message lint_warning_messages.message
FROM lint_warnings FROM lint_warnings
INNER JOIN lint_checkers INNER JOIN lint_checkers
ON lint_checkers.id = lint_warnings.lint_checker_id ON lint_checkers.id = lint_warnings.lint_checker_id
INNER JOIN (
SELECT DISTINCT ON (lint_checkers.id) lint_checkers.id AS lint_checker_id,
lint_checker_descriptions.description
FROM lint_checkers
INNER JOIN lint_checker_description_sets INNER JOIN lint_checker_description_sets
ON lint_checkers.lint_checker_description_set_id = lint_checker_description_sets.id ON lint_checkers.lint_checker_description_set_id = lint_checker_description_sets.id
INNER JOIN lint_checker_descriptions INNER JOIN lint_checker_descriptions
ON lint_checker_descriptions.id = ANY (lint_checker_description_sets.description_ids) ON lint_checker_descriptions.id = ANY (lint_checker_description_sets.description_ids)
AND lint_checker_descriptions.locale = $4 INNER JOIN guix_revision_lint_checkers
ON guix_revision_lint_checkers.lint_checker_id = lint_checkers.id
INNER JOIN guix_revisions
ON guix_revisions.id = guix_revision_lint_checkers.guix_revision_id
AND guix_revisions.commit = $1
ORDER BY lint_checkers.id,
CASE
WHEN lint_checker_descriptions.locale = $4 THEN 2
WHEN lint_checker_descriptions.locale = 'en_US.utf8' THEN 1
ELSE 0
END DESC
) AS translated_lint_checker_descriptions
ON translated_lint_checker_descriptions.lint_checker_id = lint_checkers.id
INNER JOIN packages INNER JOIN packages
ON lint_warnings.package_id = packages.id ON lint_warnings.package_id = packages.id
LEFT OUTER JOIN locations LEFT OUTER JOIN locations
@ -164,8 +181,7 @@ LEFT OUTER JOIN locations
INNER JOIN lint_warning_message_sets INNER JOIN lint_warning_message_sets
ON lint_warning_message_sets.id = lint_warning_message_set_id ON lint_warning_message_sets.id = lint_warning_message_set_id
INNER JOIN lint_warning_messages INNER JOIN lint_warning_messages
ON lint_warning_messages.locale = $4 ON lint_warning_messages.id = ANY (lint_warning_message_sets.message_ids)
AND lint_warning_messages.id = ANY (lint_warning_message_sets.message_ids)
WHERE packages.id IN ( WHERE packages.id IN (
SELECT package_derivations.package_id SELECT package_derivations.package_id
FROM package_derivations FROM package_derivations
@ -177,7 +193,14 @@ WHERE packages.id IN (
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
ORDER BY lint_warnings.id,
CASE
WHEN lint_warning_messages.locale = $4 THEN 2
WHEN lint_warning_messages.locale = 'en_US.utf8' THEN 1
ELSE 0
END DESC
")
(exec-query conn (exec-query conn
query query