From bc0be355c808120264108192f6695bc75beaeb43 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 8 Mar 2006 03:58:53 +0000
Subject: [PATCH] Adjust PL regression tests for escape_string_warning.
---
src/pl/plpython/expected/plpython_function.out | 6 +++---
src/pl/plpython/sql/plpython_function.sql | 6 +++---
src/pl/tcl/expected/pltcl_setup.out | 8 ++++----
src/pl/tcl/sql/pltcl_setup.sql | 10 +++++-----
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/pl/plpython/expected/plpython_function.out b/src/pl/plpython/expected/plpython_function.out
index dc52f4af17d..4ac5260f1e8 100644
--- a/src/pl/plpython/expected/plpython_function.out
+++ b/src/pl/plpython/expected/plpython_function.out
@@ -259,13 +259,13 @@ return seq
-- Universal Newline Support
--
CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS
-'x = 100\ny = 23\nreturn x + y\n'
+E'x = 100\ny = 23\nreturn x + y\n'
LANGUAGE plpythonu;
CREATE OR REPLACE FUNCTION newline_cr() RETURNS integer AS
-'x = 100\ry = 23\rreturn x + y\r'
+E'x = 100\ry = 23\rreturn x + y\r'
LANGUAGE plpythonu;
CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
-'x = 100\r\ny = 23\r\nreturn x + y\r\n'
+E'x = 100\r\ny = 23\r\nreturn x + y\r\n'
LANGUAGE plpythonu;
--
-- Unicode error handling
diff --git a/src/pl/plpython/sql/plpython_function.sql b/src/pl/plpython/sql/plpython_function.sql
index 7428a599eea..cbee81cc63f 100644
--- a/src/pl/plpython/sql/plpython_function.sql
+++ b/src/pl/plpython/sql/plpython_function.sql
@@ -303,15 +303,15 @@ return seq
--
CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS
-'x = 100\ny = 23\nreturn x + y\n'
+E'x = 100\ny = 23\nreturn x + y\n'
LANGUAGE plpythonu;
CREATE OR REPLACE FUNCTION newline_cr() RETURNS integer AS
-'x = 100\ry = 23\rreturn x + y\r'
+E'x = 100\ry = 23\rreturn x + y\r'
LANGUAGE plpythonu;
CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
-'x = 100\r\ny = 23\r\nreturn x + y\r\n'
+E'x = 100\r\ny = 23\r\nreturn x + y\r\n'
LANGUAGE plpythonu;
--
diff --git a/src/pl/tcl/expected/pltcl_setup.out b/src/pl/tcl/expected/pltcl_setup.out
index 0d6d253b63c..930af6c3706 100644
--- a/src/pl/tcl/expected/pltcl_setup.out
+++ b/src/pl/tcl/expected/pltcl_setup.out
@@ -38,7 +38,7 @@ create table T_dta2 (
--
-- Function to check key existance in T_pkey1
--
-create function check_pkey1_exists(int4, bpchar) returns bool as '
+create function check_pkey1_exists(int4, bpchar) returns bool as E'
if {![info exists GD]} {
set GD(plan) [spi_prepare \\
"select 1 from T_pkey1 \\
@@ -146,7 +146,7 @@ create trigger pkey1_before before insert or update or delete on T_pkey1
-- Trigger function to check for duplicate keys in T_pkey2
-- and to force key2 to be upper case only without leading whitespaces
--
-create function trig_pkey2_before() returns trigger as '
+create function trig_pkey2_before() returns trigger as E'
#
# Prepare plan on first call
#
@@ -185,7 +185,7 @@ create trigger pkey2_before before insert or update on T_pkey2
-- in T_pkey2 are done so the trigger for primkey check on T_dta2
-- fired on our updates will see the new key values in T_pkey2.
--
-create function trig_pkey2_after() returns trigger as '
+create function trig_pkey2_after() returns trigger as E'
#
# Prepare plans on first call
#
@@ -268,7 +268,7 @@ create trigger pkey2_after after update or delete on T_pkey2
--
-- Generic trigger function to check references in T_dta1 and T_dta2
--
-create function check_primkey() returns trigger as '
+create function check_primkey() returns trigger as E'
#
# For every trigger/relation pair we create
# a saved plan and hold them in GD
diff --git a/src/pl/tcl/sql/pltcl_setup.sql b/src/pl/tcl/sql/pltcl_setup.sql
index d938f9f4d65..b57a77880e3 100644
--- a/src/pl/tcl/sql/pltcl_setup.sql
+++ b/src/pl/tcl/sql/pltcl_setup.sql
@@ -44,7 +44,7 @@ create table T_dta2 (
--
-- Function to check key existance in T_pkey1
--
-create function check_pkey1_exists(int4, bpchar) returns bool as '
+create function check_pkey1_exists(int4, bpchar) returns bool as E'
if {![info exists GD]} {
set GD(plan) [spi_prepare \\
"select 1 from T_pkey1 \\
@@ -64,7 +64,7 @@ create function check_pkey1_exists(int4, bpchar) returns bool as '
--
-- Trigger function on every change to T_pkey1
--
-create function trig_pkey1_before() returns trigger as '
+create function trig_pkey1_before() returns trigger as E'
#
# Create prepared plans on the first call
#
@@ -158,7 +158,7 @@ create trigger pkey1_before before insert or update or delete on T_pkey1
-- Trigger function to check for duplicate keys in T_pkey2
-- and to force key2 to be upper case only without leading whitespaces
--
-create function trig_pkey2_before() returns trigger as '
+create function trig_pkey2_before() returns trigger as E'
#
# Prepare plan on first call
#
@@ -201,7 +201,7 @@ create trigger pkey2_before before insert or update on T_pkey2
-- in T_pkey2 are done so the trigger for primkey check on T_dta2
-- fired on our updates will see the new key values in T_pkey2.
--
-create function trig_pkey2_after() returns trigger as '
+create function trig_pkey2_after() returns trigger as E'
#
# Prepare plans on first call
#
@@ -288,7 +288,7 @@ create trigger pkey2_after after update or delete on T_pkey2
--
-- Generic trigger function to check references in T_dta1 and T_dta2
--
-create function check_primkey() returns trigger as '
+create function check_primkey() returns trigger as E'
#
# For every trigger/relation pair we create
# a saved plan and hold them in GD
--
GitLab