Skip to content

Commit a95fe59

Browse files
committed
fix regress test for Pg10 and related changes
1 parent ee0eaf2 commit a95fe59

File tree

5 files changed

+14
-9
lines changed

5 files changed

+14
-9
lines changed

expected/plpgsql_check_active.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3413,8 +3413,9 @@ $$ language plpgsql;
34133413
create type record03 as (a int, b int);
34143414
create or replace function rrecord03()
34153415
returns record03 as $$
3416-
declare r record := row(1);
3416+
declare r record;
34173417
begin
3418+
r := row(1);
34183419
return r;
34193420
end;
34203421
$$ language plpgsql;
@@ -3433,7 +3434,7 @@ select * from plpgsql_check_function('rrecord02');
34333434
select * from plpgsql_check_function('rrecord03', fatal_errors => false);
34343435
plpgsql_check_function
34353436
----------------------------------------------------------------------------------
3436-
error:42804:4:RETURN:returned record type does not match expected record type
3437+
error:42804:5:RETURN:returned record type does not match expected record type
34373438
Detail: Number of returned columns (1) does not match expected column count (2).
34383439
(2 rows)
34393440

expected/plpgsql_check_active_1.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3422,8 +3422,9 @@ $$ language plpgsql;
34223422
create type record03 as (a int, b int);
34233423
create or replace function rrecord03()
34243424
returns record03 as $$
3425-
declare r record := row(1);
3425+
declare r record;
34263426
begin
3427+
r := row(1);
34273428
return r;
34283429
end;
34293430
$$ language plpgsql;
@@ -3442,7 +3443,7 @@ select * from plpgsql_check_function('rrecord02');
34423443
select * from plpgsql_check_function('rrecord03', fatal_errors => false);
34433444
plpgsql_check_function
34443445
----------------------------------------------------------------------------------
3445-
error:42804:4:RETURN:returned record type does not match expected record type
3446+
error:42804:5:RETURN:returned record type does not match expected record type
34463447
Detail: Number of returned columns (1) does not match expected column count (2).
34473448
(2 rows)
34483449

expected/plpgsql_check_active_2.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3413,8 +3413,9 @@ $$ language plpgsql;
34133413
create type record03 as (a int, b int);
34143414
create or replace function rrecord03()
34153415
returns record03 as $$
3416-
declare r record := row(1);
3416+
declare r record;
34173417
begin
3418+
r := row(1);
34183419
return r;
34193420
end;
34203421
$$ language plpgsql;
@@ -3433,7 +3434,7 @@ select * from plpgsql_check_function('rrecord02');
34333434
select * from plpgsql_check_function('rrecord03', fatal_errors => false);
34343435
plpgsql_check_function
34353436
----------------------------------------------------------------------------------
3436-
error:42804:4:RETURN:returned record type does not match expected record type
3437+
error:42804:5:RETURN:returned record type does not match expected record type
34373438
Detail: Number of returned columns (1) does not match expected column count (2).
34383439
(2 rows)
34393440

expected/plpgsql_check_active_3.out

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3413,8 +3413,9 @@ $$ language plpgsql;
34133413
create type record03 as (a int, b int);
34143414
create or replace function rrecord03()
34153415
returns record03 as $$
3416-
declare r record := row(1);
3416+
declare r record;
34173417
begin
3418+
r := row(1);
34183419
return r;
34193420
end;
34203421
$$ language plpgsql;
@@ -3433,7 +3434,7 @@ select * from plpgsql_check_function('rrecord02');
34333434
select * from plpgsql_check_function('rrecord03', fatal_errors => false);
34343435
plpgsql_check_function
34353436
----------------------------------------------------------------------------------
3436-
error:42804:4:RETURN:returned record type does not match expected record type
3437+
error:42804:5:RETURN:returned record type does not match expected record type
34373438
Detail: Number of returned columns (1) does not match expected column count (2).
34383439
(2 rows)
34393440

sql/plpgsql_check_active.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2496,8 +2496,9 @@ create type record03 as (a int, b int);
24962496

24972497
create or replace function rrecord03()
24982498
returns record03 as $$
2499-
declare r record := row(1);
2499+
declare r record;
25002500
begin
2501+
r := row(1);
25012502
return r;
25022503
end;
25032504
$$ language plpgsql;

0 commit comments

Comments
 (0)