with --lower-case-lang-codes, handle valid language codes 🐛✅

follow-up of 2da56cd

Author: derhuerst

lib/prerequisites.js

@@ -6,6 +6,7 @@ const is_valid_lang_code = {
 -- identifiers with "_", not with "-", so we use pg_collation instead.
 -- https://www.postgresql.org/docs/current/infoschema-collations.html
 -- https://www.postgresql.org/docs/current/catalog-pg-collation.html
+-- todo [breaking]: rename to e.g. is_similar_to_bcp_47_tag?
 CREATE OR REPLACE FUNCTION "${opt.schema}".is_bcp_47_tag(
 	input TEXT
 )
@@ -14,9 +15,9 @@ AS $$
 	SELECT EXISTS (
 		SELECT collctype
 		FROM pg_collation
-		WHERE collctype = input
-		OR collname = input
-		OR collname = input || '-x-icu'
+		WHERE ${opt.lowerCaseLanguageCodes ? `lower(collctype)` : `collctype`} = ${opt.lowerCaseLanguageCodes ? `lower(input)` : `input`}
+		OR ${opt.lowerCaseLanguageCodes ? `lower(collname)` : `collname`} = ${opt.lowerCaseLanguageCodes ? `lower(input)` : `input`}
+		OR ${opt.lowerCaseLanguageCodes ? `lower(collname)` : `collname`} = ${opt.lowerCaseLanguageCodes ? `lower(input)` : `input`} || '-x-icu'
 		LIMIT 1
 	);
 $$ language sql STABLE;
@@ -30,9 +31,7 @@ CREATE OR REPLACE FUNCTION "${opt.schema}".is_valid_lang_code(
 )
 RETURNS BOOLEAN
 AS $$
-	SELECT "${opt.schema}".is_bcp_47_tag(
-		${opt.lowerCaseLanguageCodes ? `lower(input)` : `input`}
-	);
+	SELECT "${opt.schema}".is_bcp_47_tag(input);
 $$ language sql STABLE;
 
 ${opt.postgraphile ? `\

test/sample-gtfs-feed.sh

@@ -11,7 +11,8 @@ env | grep '^PG' || true
 psql -c 'create database sample_gtfs_feed'
 export PGDATABASE='sample_gtfs_feed'
 
-../cli.js -d --trips-without-shape-id -- \
+# --lower-case-lang-codes: Even though sample-gtfs-feed@0.11.2 *does not* contain invalid-case language codes (e.g. de_aT or de-at), we check that with --lower-case-lang-codes valid ones are still accepted.
+../cli.js -d --trips-without-shape-id --lower-case-lang-codes -- \
 	../node_modules/sample-gtfs-feed/gtfs/agency.txt \
 	../node_modules/sample-gtfs-feed/gtfs/calendar.txt \
 	../node_modules/sample-gtfs-feed/gtfs/calendar_dates.txt \