From 77cbb3c212797c44c9dba1bb0075a7a3dacde7aa Mon Sep 17 00:00:00 2001 From: jordi fita mas Date: Mon, 22 Jan 2024 03:24:53 +0100 Subject: [PATCH] Fix SQL to get list of all accommodation options for booking form I was using the wrong fields to join with i18n, and had the parameters to coalesce function call reversed. --- pkg/booking/public.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/booking/public.go b/pkg/booking/public.go index a5dc9c0..df286e2 100644 --- a/pkg/booking/public.go +++ b/pkg/booking/public.go @@ -196,13 +196,13 @@ func newBookingForm(ctx context.Context, company *auth.Company, conn *database.C rows, err := conn.Query(ctx, ` select 'campsite_type_option_' || option.campsite_type_option_id , slug - , coalesce(option.name, i18n.name) as l10_name + , coalesce(i18n.name, option.name) as l10_name , lower(range)::text , lower(range) , upper(range) from campsite_type_option as option join campsite_type using (campsite_type_id) - left join campsite_type_option_i18n as i18n on i18n.campsite_type_option_id = option.campsite_type_id and i18n.lang_tag = $1 + left join campsite_type_option_i18n as i18n on i18n.campsite_type_option_id = option.campsite_type_option_id and i18n.lang_tag = $1 where company_id = $2 order by option.position, l10_name `, l.Language, company.ID)