0001-change-locale-name-for-test-collate.windows.win1252.patch

application/octet-stream

Filename: 0001-change-locale-name-for-test-collate.windows.win1252.patch
Type: application/octet-stream
Part: 1
Message: Re: WIN32 pg_import_system_collations

Patch

Format: format-patch
Series: patch 0001
Subject: change locale name for test collate.windows.win1252
File+
src/test/regress/expected/collate.windows.win1252.out 1 1
src/test/regress/sql/collate.windows.win1252.sql 1 1
From 11d75e5bf3cd0336f9cd08c637f9f2ab33d59a63 Mon Sep 17 00:00:00 2001
From: Juan Jose Santamaria Flecha <juanjo.santamaria@gmail.com>
Date: Mon, 27 Feb 2023 17:00:19 -0500
Subject: [PATCH] change locale name for test collate.windows.win1252

The locale name 'de_DE' seems to be problematic on some Windows versions, change it to 'de-DE' to make the test more robust.
---
 src/test/regress/expected/collate.windows.win1252.out | 2 +-
 src/test/regress/sql/collate.windows.win1252.sql      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/regress/expected/collate.windows.win1252.out b/src/test/regress/expected/collate.windows.win1252.out
index 4d538f2..869808c 100644
--- a/src/test/regress/expected/collate.windows.win1252.out
+++ b/src/test/regress/expected/collate.windows.win1252.out
@@ -362,7 +362,7 @@ SELECT relname FROM pg_class WHERE relname ~* '^abc';
 (0 rows)
 
 -- to_char
-SET lc_time TO 'de_DE';
+SET lc_time TO 'de-DE';
 SELECT to_char(date '2010-03-01', 'DD TMMON YYYY');
    to_char
 -------------
diff --git a/src/test/regress/sql/collate.windows.win1252.sql b/src/test/regress/sql/collate.windows.win1252.sql
index 64f5ef9..132897e 100644
--- a/src/test/regress/sql/collate.windows.win1252.sql
+++ b/src/test/regress/sql/collate.windows.win1252.sql
@@ -152,7 +152,7 @@ SELECT relname FROM pg_class WHERE relname ~* '^abc';
 
 -- to_char
 
-SET lc_time TO 'de_DE';
+SET lc_time TO 'de-DE';
 SELECT to_char(date '2010-03-01', 'DD TMMON YYYY');
 SELECT to_char(date '2010-03-01', 'DD TMMON YYYY' COLLATE "de_DE");
 
-- 
2.11.0