From 06f4a539418121df6a0171390d1f0d6bef1519ae Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 24 Aug 2005 19:24:54 +0000 Subject: [PATCH] Make the plperl regression tests pass in 'use_strict' mode, by adding 'my' where appropriate. Michael Fuhr --- src/pl/plperl/expected/plperl.out | 6 +++--- src/pl/plperl/sql/plperl.sql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out index 2ba89ea2c3..a2b34a78cb 100644 --- a/src/pl/plperl/expected/plperl.out +++ b/src/pl/plperl/expected/plperl.out @@ -336,7 +336,7 @@ SELECT perl_get_field((11,12), 'z'); -- Test return_next -- CREATE OR REPLACE FUNCTION perl_srf_rn() RETURNS SETOF RECORD AS $$ -$i = 0; +my $i = 0; for ("World", "PostgreSQL", "PL/Perl") { return_next({f1=>++$i, f2=>'Hello', f3=>$_}); } @@ -354,8 +354,8 @@ SELECT * from perl_srf_rn() AS (f1 INTEGER, f2 TEXT, f3 TEXT); -- Test spi_query/spi_fetchrow -- CREATE OR REPLACE FUNCTION perl_spi_func() RETURNS SETOF INTEGER AS $$ -$x = spi_query("select 1 as a union select 2 as a"); -while (defined ($y = spi_fetchrow($x))) { +my $x = spi_query("select 1 as a union select 2 as a"); +while (defined (my $y = spi_fetchrow($x))) { return_next($y->{a}); } return; diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql index c274659e7c..e6fc5c35dd 100644 --- a/src/pl/plperl/sql/plperl.sql +++ b/src/pl/plperl/sql/plperl.sql @@ -240,7 +240,7 @@ SELECT perl_get_field((11,12), 'z'); -- CREATE OR REPLACE FUNCTION perl_srf_rn() RETURNS SETOF RECORD AS $$ -$i = 0; +my $i = 0; for ("World", "PostgreSQL", "PL/Perl") { return_next({f1=>++$i, f2=>'Hello', f3=>$_}); } @@ -253,8 +253,8 @@ SELECT * from perl_srf_rn() AS (f1 INTEGER, f2 TEXT, f3 TEXT); -- CREATE OR REPLACE FUNCTION perl_spi_func() RETURNS SETOF INTEGER AS $$ -$x = spi_query("select 1 as a union select 2 as a"); -while (defined ($y = spi_fetchrow($x))) { +my $x = spi_query("select 1 as a union select 2 as a"); +while (defined (my $y = spi_fetchrow($x))) { return_next($y->{a}); } return;