Skip to content

Commit bc0be35

Browse files
committed
Adjust PL regression tests for escape_string_warning.
1 parent daab4a1 commit bc0be35

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/pl/plpython/expected/plpython_function.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ return seq
259259
-- Universal Newline Support
260260
--
261261
CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS
262-
'x = 100\ny = 23\nreturn x + y\n'
262+
E'x = 100\ny = 23\nreturn x + y\n'
263263
LANGUAGE plpythonu;
264264
CREATE OR REPLACE FUNCTION newline_cr() RETURNS integer AS
265-
'x = 100\ry = 23\rreturn x + y\r'
265+
E'x = 100\ry = 23\rreturn x + y\r'
266266
LANGUAGE plpythonu;
267267
CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
268-
'x = 100\r\ny = 23\r\nreturn x + y\r\n'
268+
E'x = 100\r\ny = 23\r\nreturn x + y\r\n'
269269
LANGUAGE plpythonu;
270270
--
271271
-- Unicode error handling

src/pl/plpython/sql/plpython_function.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,15 @@ return seq
303303
--
304304

305305
CREATE OR REPLACE FUNCTION newline_lf() RETURNS integer AS
306-
'x = 100\ny = 23\nreturn x + y\n'
306+
E'x = 100\ny = 23\nreturn x + y\n'
307307
LANGUAGE plpythonu;
308308

309309
CREATE OR REPLACE FUNCTION newline_cr() RETURNS integer AS
310-
'x = 100\ry = 23\rreturn x + y\r'
310+
E'x = 100\ry = 23\rreturn x + y\r'
311311
LANGUAGE plpythonu;
312312

313313
CREATE OR REPLACE FUNCTION newline_crlf() RETURNS integer AS
314-
'x = 100\r\ny = 23\r\nreturn x + y\r\n'
314+
E'x = 100\r\ny = 23\r\nreturn x + y\r\n'
315315
LANGUAGE plpythonu;
316316

317317
--

src/pl/tcl/expected/pltcl_setup.out

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ create table T_dta2 (
3838
--
3939
-- Function to check key existance in T_pkey1
4040
--
41-
create function check_pkey1_exists(int4, bpchar) returns bool as '
41+
create function check_pkey1_exists(int4, bpchar) returns bool as E'
4242
if {![info exists GD]} {
4343
set GD(plan) [spi_prepare \\
4444
"select 1 from T_pkey1 \\
@@ -146,7 +146,7 @@ create trigger pkey1_before before insert or update or delete on T_pkey1
146146
-- Trigger function to check for duplicate keys in T_pkey2
147147
-- and to force key2 to be upper case only without leading whitespaces
148148
--
149-
create function trig_pkey2_before() returns trigger as '
149+
create function trig_pkey2_before() returns trigger as E'
150150
#
151151
# Prepare plan on first call
152152
#
@@ -185,7 +185,7 @@ create trigger pkey2_before before insert or update on T_pkey2
185185
-- in T_pkey2 are done so the trigger for primkey check on T_dta2
186186
-- fired on our updates will see the new key values in T_pkey2.
187187
--
188-
create function trig_pkey2_after() returns trigger as '
188+
create function trig_pkey2_after() returns trigger as E'
189189
#
190190
# Prepare plans on first call
191191
#
@@ -268,7 +268,7 @@ create trigger pkey2_after after update or delete on T_pkey2
268268
--
269269
-- Generic trigger function to check references in T_dta1 and T_dta2
270270
--
271-
create function check_primkey() returns trigger as '
271+
create function check_primkey() returns trigger as E'
272272
#
273273
# For every trigger/relation pair we create
274274
# a saved plan and hold them in GD

src/pl/tcl/sql/pltcl_setup.sql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ create table T_dta2 (
4444
--
4545
-- Function to check key existance in T_pkey1
4646
--
47-
create function check_pkey1_exists(int4, bpchar) returns bool as '
47+
create function check_pkey1_exists(int4, bpchar) returns bool as E'
4848
if {![info exists GD]} {
4949
set GD(plan) [spi_prepare \\
5050
"select 1 from T_pkey1 \\
@@ -64,7 +64,7 @@ create function check_pkey1_exists(int4, bpchar) returns bool as '
6464
--
6565
-- Trigger function on every change to T_pkey1
6666
--
67-
create function trig_pkey1_before() returns trigger as '
67+
create function trig_pkey1_before() returns trigger as E'
6868
#
6969
# Create prepared plans on the first call
7070
#
@@ -158,7 +158,7 @@ create trigger pkey1_before before insert or update or delete on T_pkey1
158158
-- Trigger function to check for duplicate keys in T_pkey2
159159
-- and to force key2 to be upper case only without leading whitespaces
160160
--
161-
create function trig_pkey2_before() returns trigger as '
161+
create function trig_pkey2_before() returns trigger as E'
162162
#
163163
# Prepare plan on first call
164164
#
@@ -201,7 +201,7 @@ create trigger pkey2_before before insert or update on T_pkey2
201201
-- in T_pkey2 are done so the trigger for primkey check on T_dta2
202202
-- fired on our updates will see the new key values in T_pkey2.
203203
--
204-
create function trig_pkey2_after() returns trigger as '
204+
create function trig_pkey2_after() returns trigger as E'
205205
#
206206
# Prepare plans on first call
207207
#
@@ -288,7 +288,7 @@ create trigger pkey2_after after update or delete on T_pkey2
288288
--
289289
-- Generic trigger function to check references in T_dta1 and T_dta2
290290
--
291-
create function check_primkey() returns trigger as '
291+
create function check_primkey() returns trigger as E'
292292
#
293293
# For every trigger/relation pair we create
294294
# a saved plan and hold them in GD

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy