Fix the conflict with code of master branch

bigplaice · bigplaice · commit e8b610ac572d · 2025-08-29T15:46:50.000+08:00
diff --git a/src/oracle_test/regress/expected/domain.out b/src/oracle_test/regress/expected/domain.out
@@ -60,13 +60,13 @@ create domain d_fail as int4 constraint cc generated by default as identity;
 ERROR:  specifying GENERATED not supported for domains
 LINE 1: create domain d_fail as int4 constraint cc generated by defa...
                                      ^
-create domain d_fail as int4 constraint cc check (values > 1) no inherit;
+create domain d_fail as int4 constraint cc check (velues > 1) no inherit;
 ERROR:  check constraints for domains cannot be marked NO INHERIT
-LINE 1: create domain d_fail as int4 constraint cc check (values > 1...
+LINE 1: create domain d_fail as int4 constraint cc check (velues > 1...
                                      ^
-create domain d_fail as int4 constraint cc check (values > 1) deferrable;
+create domain d_fail as int4 constraint cc check (velues > 1) deferrable;
 ERROR:  specifying constraint deferrability not supported for domains
-LINE 1: ...n d_fail as int4 constraint cc check (values > 1) deferrable...
+LINE 1: ...n d_fail as int4 constraint cc check (velues > 1) deferrable...
                                                              ^
 -- Test domain input.
 -- Note: the point of checking both INSERT and COPY FROM is that INSERT
diff --git a/src/oracle_test/regress/expected/plpgsql_2.out b/src/oracle_test/regress/expected/plpgsql_2.out
@@ -2463,7 +2463,7 @@ end $$ language plpgsql;
 /
 select namedparmcursor_test7();
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "42/0 AS p1, 77 AS p2"
+CONTEXT:  SQL expression "42/0 AS p1, 77 AS p2"
 PL/pgSQL function namedparmcursor_test7() line 6 at OPEN
 -- check that line comments work correctly within the argument list
 -- (this used to require a special hack in the code; it no longer does,
@@ -4750,11 +4750,11 @@ $$;
 /
 select fail();
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "1/0"
+CONTEXT:  SQL expression "1/0"
 PL/pgSQL function fail() line 3 at RETURN
 select fail();
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "1/0"
+CONTEXT:  SQL expression "1/0"
 PL/pgSQL function fail() line 3 at RETURN
 drop function fail();
 -- Test handling of string literals.
diff --git a/src/oracle_test/regress/sql/domain.sql b/src/oracle_test/regress/sql/domain.sql
@@ -28,8 +28,8 @@ create domain d_fail as anyelement;
 create domain d_fail as int4 unique;
 create domain d_fail as int4 PRIMARY key;
 create domain d_fail as int4 constraint cc generated by default as identity;
-create domain d_fail as int4 constraint cc check (values > 1) no inherit;
-create domain d_fail as int4 constraint cc check (values > 1) deferrable;
+create domain d_fail as int4 constraint cc check (velues > 1) no inherit;
+create domain d_fail as int4 constraint cc check (velues > 1) deferrable;
 
 -- Test domain input.
 
diff --git a/src/pl/plisql/src/expected/plisql_record.out b/src/pl/plisql/src/expected/plisql_record.out
@@ -281,7 +281,7 @@ NOTICE:  r1.q1 = <NULL>
 NOTICE:  r1.q2 = <NULL>
 NOTICE:  r1 = <NULL>
 ERROR:  record "r1" has no field "nosuchfield"
-CONTEXT:  PL/pgSQL expression "r1.nosuchfield"
+CONTEXT:  SQL expression "r1.nosuchfield"
 PL/iSQL function inline_code_block line 7 at RAISE
 -- records, not so much
 do $$
@@ -295,7 +295,7 @@ end$$;
 NOTICE:  r1 = <NULL>
 ERROR:  record "r1" is not assigned yet
 DETAIL:  The tuple structure of a not-yet-assigned record is indeterminate.
-CONTEXT:  PL/pgSQL expression "r1.f1"
+CONTEXT:  SQL expression "r1.f1"
 PL/iSQL function inline_code_block line 5 at RAISE
 -- but OK if you assign first
 do $$
@@ -313,7 +313,7 @@ NOTICE:  r1.f1 = 1
 NOTICE:  r1.f2 = 2
 NOTICE:  r1 = (1,2)
 ERROR:  record "r1" has no field "nosuchfield"
-CONTEXT:  PL/pgSQL expression "r1.nosuchfield"
+CONTEXT:  SQL expression "r1.nosuchfield"
 PL/iSQL function inline_code_block line 9 at RAISE
 -- check %type with block-qualified variable names
 do $$
@@ -618,7 +618,7 @@ $$ begin return x.f3; end $$;
 /
 select getf3(null::mutable);  -- doesn't work yet
 ERROR:  record "x" has no field "f3"
-CONTEXT:  PL/pgSQL expression "x.f3"
+CONTEXT:  SQL expression "x.f3"
 PL/iSQL function getf3(mutable) line 1 at RETURN
 alter table mutable add column f3 int;
 select getf3(null::mutable);  -- now it works
diff --git a/src/pl/plisql/src/expected/plisql_type_rowtype.out b/src/pl/plisql/src/expected/plisql_type_rowtype.out
@@ -3292,6 +3292,8 @@ end;
 /
 NOTICE:  type reference tb1.id%TYPE converted to pg_catalog.int4
 ERROR:  column "i2d" of relation "tb1" does not exist
+LINE 1: create function fun1(c1 tb1.id%type,c2 tb1.i2d%type, c3 tb1....
+                                               ^
 create function fun1(c1 tb1.id%type,c2 tb1.id2%type, c3 tb1.id3%type, c4 tb1.id4%type, c5 tb1.name1%type, c6 tb1.name2%type) return tb1.name1%type is
 begin
   return c5;
diff --git a/src/pl/plisql/src/expected/plisql_varprops.out b/src/pl/plisql/src/expected/plisql_varprops.out
@@ -76,7 +76,7 @@ begin
   raise notice 'x = %', x;
 end$$;
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "1/0"
+CONTEXT:  SQL expression "1/0"
 PL/iSQL function inline_code_block line 2 during statement block local variable initialization
 do $$
 declare x bigint[] := array[1,3,5];
diff --git a/src/pl/plpgsql/src/expected/plpgsql_record_1.out b/src/pl/plpgsql/src/expected/plpgsql_record_1.out
@@ -410,7 +410,7 @@ NOTICE:  r1.q1 = <NULL>
 NOTICE:  r1.q2 = <NULL>
 NOTICE:  r1 = <NULL>
 ERROR:  record "r1" has no field "nosuchfield"
-CONTEXT:  PL/pgSQL expression "r1.nosuchfield"
+CONTEXT:  SQL expression "r1.nosuchfield"
 PL/pgSQL function inline_code_block line 7 at RAISE
 do $$
 declare r1 two_int8s;
@@ -434,7 +434,7 @@ end$$ language plpgsql;
 NOTICE:  r1 = <NULL>
 ERROR:  record "r1" is not assigned yet
 DETAIL:  The tuple structure of a not-yet-assigned record is indeterminate.
-CONTEXT:  PL/pgSQL expression "r1.f1"
+CONTEXT:  SQL expression "r1.f1"
 PL/pgSQL function inline_code_block line 5 at RAISE
 do $$
 declare r1 record;
@@ -462,7 +462,7 @@ NOTICE:  r1.f1 = 1
 NOTICE:  r1.f2 = 2
 NOTICE:  r1 = (1,2)
 ERROR:  record "r1" has no field "nosuchfield"
-CONTEXT:  PL/pgSQL expression "r1.nosuchfield"
+CONTEXT:  SQL expression "r1.nosuchfield"
 PL/pgSQL function inline_code_block line 9 at RAISE
 do $$
 declare r1 record;
@@ -802,7 +802,7 @@ create function getf3(x mutable) returns int language plpgsql as
 $$ begin return x.f3; end $$;
 select getf3(null::mutable);  -- doesn't work yet
 ERROR:  record "x" has no field "f3"
-CONTEXT:  PL/pgSQL expression "x.f3"
+CONTEXT:  SQL expression "x.f3"
 PL/pgSQL function getf3(mutable) line 1 at RETURN
 alter table mutable add column f3 int;
 select getf3(null::mutable);  -- now it works
diff --git a/src/pl/plpgsql/src/expected/plpgsql_varprops_1.out b/src/pl/plpgsql/src/expected/plpgsql_varprops_1.out
@@ -135,7 +135,7 @@ begin
   raise notice 'x = %', x;
 end$$ language plpgsql;
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "1/0"
+CONTEXT:  SQL expression "1/0"
 PL/pgSQL function inline_code_block line 2 during statement block local variable initialization
 do $$
 declare x int := 1/0;  -- fail
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
@@ -2388,7 +2388,7 @@ begin
 end $$ language plpgsql;
 select namedparmcursor_test7();
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "42/0 AS p1, 77 AS p2"
+CONTEXT:  SQL expression "42/0 AS p1, 77 AS p2"
 PL/pgSQL function namedparmcursor_test7() line 6 at OPEN
 -- check that line comments work correctly within the argument list
 -- (this used to require a special hack in the code; it no longer does,
@@ -4565,11 +4565,11 @@ end
 $$;
 select fail();
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "1/0"
+CONTEXT:  SQL expression "1/0"
 PL/pgSQL function fail() line 3 at RETURN
 select fail();
 ERROR:  division by zero
-CONTEXT:  PL/pgSQL expression "1/0"
+CONTEXT:  SQL expression "1/0"
 PL/pgSQL function fail() line 3 at RETURN
 drop function fail();
 -- Test handling of string literals.

Original file line number	Diff line number	Diff line change
`@@ -60,13 +60,13 @@ create domain d_fail as int4 constraint cc generated by default as identity;`
`60`	`60`	`ERROR: specifying GENERATED not supported for domains`
`61`	`61`	`LINE 1: create domain d_fail as int4 constraint cc generated by defa...`
`62`	`62`	`^`
`63`		`-create domain d_fail as int4 constraint cc check (values > 1) no inherit;`
	`63`	`+create domain d_fail as int4 constraint cc check (velues > 1) no inherit;`
`64`	`64`	`ERROR: check constraints for domains cannot be marked NO INHERIT`
`65`		`-LINE 1: create domain d_fail as int4 constraint cc check (values > 1...`
	`65`	`+LINE 1: create domain d_fail as int4 constraint cc check (velues > 1...`
`66`	`66`	`^`
`67`		`-create domain d_fail as int4 constraint cc check (values > 1) deferrable;`
	`67`	`+create domain d_fail as int4 constraint cc check (velues > 1) deferrable;`
`68`	`68`	`ERROR: specifying constraint deferrability not supported for domains`
`69`		`-LINE 1: ...n d_fail as int4 constraint cc check (values > 1) deferrable...`
	`69`	`+LINE 1: ...n d_fail as int4 constraint cc check (velues > 1) deferrable...`
`70`	`70`	`^`
`71`	`71`	`-- Test domain input.`
`72`	`72`	`-- Note: the point of checking both INSERT and COPY FROM is that INSERT`
Original file line number	Diff line number	Diff line change
`@@ -3292,6 +3292,8 @@ end;`
`3292`	`3292`	`/`
`3293`	`3293`	`NOTICE: type reference tb1.id%TYPE converted to pg_catalog.int4`
`3294`	`3294`	`ERROR: column "i2d" of relation "tb1" does not exist`
	`3295`	`+LINE 1: create function fun1(c1 tb1.id%type,c2 tb1.i2d%type, c3 tb1....`
	`3296`	`+ ^`
`3295`	`3297`	`create function fun1(c1 tb1.id%type,c2 tb1.id2%type, c3 tb1.id3%type, c4 tb1.id4%type, c5 tb1.name1%type, c6 tb1.name2%type) return tb1.name1%type is`
`3296`	`3298`	`begin`
`3297`	`3299`	`return c5;`