database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-06 07:49:08 +03:00
Code Activity

Fix previous commit's test, for non-UTF8 databases with non-XML builds.

Browse Source 
To ensure stable output, catch one more configuration-specific error.
Back-patch to 9.3, like the commit that added the test.
This commit is contained in:
Noah Misch
2017-11-11 13:07:46 -08:00
parent 2918fcedbf
commit 4b865aee25
4 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/regress/sql/xml.sql
View File

@@ -196,11 +196,12 @@ DECLARE
degree_symbol text;
res xml[];
BEGIN
-- Per the documentation, xpath() doesn't work on non-ASCII data when
-- the server encoding is not UTF8. The EXCEPTION block below,
-- currently dead code, will be relevant if we remove this limitation.
-- Per the documentation, except when the server encoding is UTF8, xpath()
-- may not work on non-ASCII data. The untranslatable_character and
-- undefined_function traps below, currently dead code, will become relevant
-- if we remove this limitation.
IF current_setting('server_encoding') <> 'UTF8' THEN
RAISE LOG 'skip: encoding % unsupported for xml',
RAISE LOG 'skip: encoding % unsupported for xpath',
current_setting('server_encoding');
RETURN;
END IF;
@@ -215,9 +216,12 @@ BEGIN
END IF;
EXCEPTION
-- character with byte sequence 0xc2 0xb0 in encoding "UTF8" has no equivalent in encoding "LATIN8"
WHEN untranslatable_character THEN RAISE LOG 'skip: %', SQLERRM;
WHEN untranslatable_character
-- default conversion function for encoding "UTF8" to "MULE_INTERNAL" does not exist
WHEN undefined_function THEN RAISE LOG 'skip: %', SQLERRM;
OR undefined_function
-- unsupported XML feature
OR feature_not_supported THEN
RAISE LOG 'skip: %', SQLERRM;
END
$$;