From daab4a101fc1198c20992c036157dd2a4b588a68 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 8 Mar 2006 03:51:52 +0000
Subject: [PATCH] Update /contrib regression tests for escape_string_warning.
---
contrib/earthdistance/earthdistance.sql.in | 2 +-
contrib/pgcrypto/expected/pgp-encrypt.out | 6 +++---
contrib/pgcrypto/sql/pgp-encrypt.sql | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/contrib/earthdistance/earthdistance.sql.in b/contrib/earthdistance/earthdistance.sql.in
index 3811b1d77f5..a7535f5d49c 100644
--- a/contrib/earthdistance/earthdistance.sql.in
+++ b/contrib/earthdistance/earthdistance.sql.in
@@ -9,7 +9,7 @@ SET search_path = public;
CREATE OR REPLACE FUNCTION earth() RETURNS float8
LANGUAGE SQL IMMUTABLE
-AS 'SELECT \'6378168\'::float8';
+AS 'SELECT ''6378168''::float8';
-- Astromers may want to change the earth function so that distances will be
-- returned in degrees. To do this comment out the above definition and
diff --git a/contrib/pgcrypto/expected/pgp-encrypt.out b/contrib/pgcrypto/expected/pgp-encrypt.out
index ab33a04eec3..637b4738378 100644
--- a/contrib/pgcrypto/expected/pgp-encrypt.out
+++ b/contrib/pgcrypto/expected/pgp-encrypt.out
@@ -170,7 +170,7 @@ select pgp_sym_decrypt(
-- crlf
select encode(pgp_sym_decrypt_bytea(
- pgp_sym_encrypt('1\n2\n3\r\n', 'key', 'convert-crlf=1'),
+ pgp_sym_encrypt(E'1\n2\n3\r\n', 'key', 'convert-crlf=1'),
'key'), 'hex');
encode
----------------------
@@ -179,9 +179,9 @@ select encode(pgp_sym_decrypt_bytea(
-- conversion should be lossless
select encode(digest(pgp_sym_decrypt(
- pgp_sym_encrypt('\r\n0\n1\r\r\n\n2\r', 'key', 'convert-crlf=1'),
+ pgp_sym_encrypt(E'\r\n0\n1\r\r\n\n2\r', 'key', 'convert-crlf=1'),
'key', 'convert-crlf=1'), 'sha1'), 'hex') as result,
- encode(digest('\r\n0\n1\r\r\n\n2\r', 'sha1'), 'hex') as expect;
+ encode(digest(E'\r\n0\n1\r\r\n\n2\r', 'sha1'), 'hex') as expect;
result | expect
------------------------------------------+------------------------------------------
47bde5d88d6ef8770572b9cbb4278b402aa69966 | 47bde5d88d6ef8770572b9cbb4278b402aa69966
diff --git a/contrib/pgcrypto/sql/pgp-encrypt.sql b/contrib/pgcrypto/sql/pgp-encrypt.sql
index b663e051aec..03b34c8ad25 100644
--- a/contrib/pgcrypto/sql/pgp-encrypt.sql
+++ b/contrib/pgcrypto/sql/pgp-encrypt.sql
@@ -85,12 +85,12 @@ select pgp_sym_decrypt(
-- crlf
select encode(pgp_sym_decrypt_bytea(
- pgp_sym_encrypt('1\n2\n3\r\n', 'key', 'convert-crlf=1'),
+ pgp_sym_encrypt(E'1\n2\n3\r\n', 'key', 'convert-crlf=1'),
'key'), 'hex');
-- conversion should be lossless
select encode(digest(pgp_sym_decrypt(
- pgp_sym_encrypt('\r\n0\n1\r\r\n\n2\r', 'key', 'convert-crlf=1'),
+ pgp_sym_encrypt(E'\r\n0\n1\r\r\n\n2\r', 'key', 'convert-crlf=1'),
'key', 'convert-crlf=1'), 'sha1'), 'hex') as result,
- encode(digest('\r\n0\n1\r\r\n\n2\r', 'sha1'), 'hex') as expect;
+ encode(digest(E'\r\n0\n1\r\r\n\n2\r', 'sha1'), 'hex') as expect;
--
GitLab