aboutsummaryrefslogtreecommitdiff
path: root/src/test/regress/expected/xml_2.out
diff options
context:
space:
mode:
Diffstat (limited to 'src/test/regress/expected/xml_2.out')
-rw-r--r--src/test/regress/expected/xml_2.out16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/test/regress/expected/xml_2.out b/src/test/regress/expected/xml_2.out
index 3868da1a0d5..112ebe47cd0 100644
--- a/src/test/regress/expected/xml_2.out
+++ b/src/test/regress/expected/xml_2.out
@@ -657,11 +657,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;
@@ -676,9 +677,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
$$;
-- Test xmlexists and xpath_exists