diff --git a/src/gausskernel/process/tcop/utility.cpp b/src/gausskernel/process/tcop/utility.cpp index 9bff438869b358cb3da096c39d85ce66da311175..b347376ba9e08a415b8eb785f5e3dd3e4a115b4a 100755 --- a/src/gausskernel/process/tcop/utility.cpp +++ b/src/gausskernel/process/tcop/utility.cpp @@ -3587,7 +3587,8 @@ void standard_ProcessUtility(Node* parse_tree, const char* query_string, ParamLi case T_AlterDomainStmt: #ifdef PGXC - ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("domain is not yet supported."))); + /*Single node support domain feature.*/ + /* ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("domain is not yet supported.")));*/ #endif /* PGXC */ { AlterDomainStmt* stmt = (AlterDomainStmt*)parse_tree; @@ -4928,8 +4929,9 @@ void standard_ProcessUtility(Node* parse_tree, const char* query_string, ParamLi */ case T_CreateDomainStmt: #ifdef PGXC - if (!IsInitdb && !u_sess->attr.attr_common.IsInplaceUpgrade) - ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("domain is not yet supported."))); + /*Single node support domain feature.*/ + /* if (!IsInitdb && !u_sess->attr.attr_common.IsInplaceUpgrade) + ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("domain is not yet supported.")));*/ #endif /* PGXC */ DefineDomain((CreateDomainStmt*)parse_tree); #ifdef PGXC @@ -8564,9 +8566,10 @@ void CheckObjectInBlackList(ObjectType obj_type, const char* query_string) case OBJECT_LANGUAGE: tag = "LANGUAGE"; break; - case OBJECT_DOMAIN: + /*Single node support domain feature.*/ + /* case OBJECT_DOMAIN: tag = "DOMAIN"; - break; + break;*/ case OBJECT_CONVERSION: tag = "CONVERSION"; break; diff --git a/src/test/regress/expected/alter_table_003.out b/src/test/regress/expected/alter_table_003.out index 8f76b2a6c3d3a8788d87ad3f3f5304b95b66a17b..1d10df993bfb3d435b75c0e0cc8661efda55dbbd 100644 --- a/src/test/regress/expected/alter_table_003.out +++ b/src/test/regress/expected/alter_table_003.out @@ -294,56 +294,50 @@ drop table p1 cascade; -- test that operations with a dropped column do not try to reference -- its datatype create domain mytype as text; -ERROR: domain is not yet supported. create table foo (f1 text, f2 mytype, f3 text);; -ERROR: type "mytype" does not exist -LINE 1: create table foo (f1 text, f2 mytype, f3 text); - ^ insert into foo values('bb','cc','dd'); -ERROR: relation "foo" does not exist on datanode1 -LINE 1: insert into foo values('bb','cc','dd'); - ^ select * from foo order by f1; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: select * from foo order by f1; - ^ + f1 | f2 | f3 +----+----+---- + bb | cc | dd +(1 row) + drop domain mytype cascade; -ERROR: type "mytype" does not exist +NOTICE: drop cascades to table foo column f2 select * from foo order by f1; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: select * from foo order by f1; - ^ + f1 | f3 +----+---- + bb | dd +(1 row) + insert into foo values('qq','rr'); -ERROR: relation "foo" does not exist on datanode1 -LINE 1: insert into foo values('qq','rr'); - ^ select * from foo order by f1; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: select * from foo order by f1; - ^ + f1 | f3 +----+---- + bb | dd + qq | rr +(2 rows) + update foo set f3 = 'zz'; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: update foo set f3 = 'zz'; - ^ select * from foo order by f1; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: select * from foo order by f1; - ^ + f1 | f3 +----+---- + bb | zz + qq | zz +(2 rows) + select f3,max(f1) from foo group by f3; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: select f3,max(f1) from foo group by f3; - ^ + f3 | max +----+----- + zz | qq +(1 row) + -- Simple tests for alter table column type delete from foo where f1 = 'qq'; -ERROR: relation "foo" does not exist on datanode1 -LINE 1: delete from foo where f1 = 'qq'; - ^ alter table foo alter f1 TYPE integer; -- fails -ERROR: relation "foo" does not exist +ERROR: invalid input syntax for integer: "bb" alter table foo alter f1 TYPE varchar(10); -ERROR: relation "foo" does not exist drop table foo; -ERROR: table "foo" does not exist create table anothertab (atcol1 serial8, atcol2 boolean, constraint anothertab_chk check (atcol1 <= 3));; NOTICE: CREATE TABLE will create implicit sequence "anothertab_atcol1_seq" for serial column "anothertab.atcol1" @@ -446,11 +440,8 @@ ERROR: composite type recur1 cannot be made a member of itself alter table recur1 add column f2 recur1[]; -- fails ERROR: composite type recur1 cannot be made a member of itself create domain array_of_recur1 as recur1[]; -ERROR: domain is not yet supported. alter table recur1 add column f2 array_of_recur1; -- fails -ERROR: type "array_of_recur1" does not exist -LINE 1: alter table recur1 add column f2 array_of_recur1; - ^ +ERROR: composite type recur1 cannot be made a member of itself create table recur2 (f1 int, f2 recur1); alter table recur1 add column f2 recur2; -- fails ERROR: composite type recur1 cannot be made a member of itself @@ -649,7 +640,6 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t1_pkey" for tab create view alter1.v1 as select * from alter1.t1; create function alter1.plus1(int) returns int as 'select $1+1' language sql; create domain alter1.posint integer check (value > 0); -ERROR: domain is not yet supported. create type alter1.ctype as (f1 int, f2 text); create function alter1.same(alter1.ctype, alter1.ctype) returns boolean language sql as 'select $1.f1 is not distinct from $2.f1 and $1.f2 is not distinct from $2.f2'; @@ -675,7 +665,6 @@ ERROR: There's dependent sequence, but ALTER SEQUENCE SET SCHEMA is not yet sup alter table alter1.v1 set schema alter2; alter function alter1.plus1(int) set schema alter2; alter domain alter1.posint set schema alter2; -ERROR: type "alter1.posint" does not exist alter operator class alter1.ctype_hash_ops using hash set schema alter2; ERROR: operator class "alter1.ctype_hash_ops" does not exist for access method "hash" alter operator family alter1.ctype_hash_ops using hash set schema alter2; @@ -727,9 +716,10 @@ select alter2.plus1(41); -- clean up drop schema alter2 cascade; -NOTICE: drop cascades to 4 other objects +NOTICE: drop cascades to 5 other objects DETAIL: drop cascades to view alter2.v1 drop cascades to function alter2.plus1(integer) +drop cascades to type alter2.posint drop cascades to type alter2.ctype drop cascades to function alter2.same(alter2.ctype,alter2.ctype) drop schema alter1 cascade; diff --git a/src/test/regress/expected/backtrace_log.out b/src/test/regress/expected/backtrace_log.out index e05b9fbe7c7d2183fc5bf9c3eaa553a917c95e7f..42432838f5b4e4c681f598dfdc7a97e321edf535 100644 --- a/src/test/regress/expected/backtrace_log.out +++ b/src/test/regress/expected/backtrace_log.out @@ -8,7 +8,7 @@ select count(*) from pg_node_env; select count(*) from pg_os_threads; count ------- - 29 + 10 (1 row) -- test backtrace output to log diff --git a/src/test/regress/expected/collate.out b/src/test/regress/expected/collate.out index 87923166165f36e55ef6fa6514d388102e5e9212..c959b4f67926d14309e2dc0f5878952906482cb7 100644 --- a/src/test/regress/expected/collate.out +++ b/src/test/regress/expected/collate.out @@ -71,39 +71,36 @@ ERROR: collation mismatch between explicit collations "C" and "POSIX" LINE 1: ...* FROM collate_test1 WHERE b COLLATE "C" >= 'bbc' COLLATE "P... ^ CREATE DOMAIN testdomain_p AS text COLLATE "POSIX"; -ERROR: domain is not yet supported. CREATE DOMAIN testdomain_i AS int COLLATE "POSIX"; -- fail -ERROR: domain is not yet supported. +ERROR: collations are not supported by type integer CREATE TABLE collate_test4 ( a int, b testdomain_p ); -ERROR: type "testdomain_p" does not exist -LINE 3: b testdomain_p - ^ INSERT INTO collate_test4 SELECT * FROM collate_test1; -ERROR: relation "collate_test4" does not exist on datanode1 -LINE 1: INSERT INTO collate_test4 SELECT * FROM collate_test1; - ^ SELECT a, b FROM collate_test4 ORDER BY b; -ERROR: relation "collate_test4" does not exist on datanode1 -LINE 1: SELECT a, b FROM collate_test4 ORDER BY b; - ^ + a | b +---+----- + 4 | ABD + 2 | Abc + 1 | abc + 3 | bbc +(4 rows) + CREATE TABLE collate_test5 ( a int, b testdomain_p COLLATE "C" ); -ERROR: type "testdomain_p" does not exist -LINE 3: b testdomain_p COLLATE "C" - ^ INSERT INTO collate_test5 SELECT * FROM collate_test1; -ERROR: relation "collate_test5" does not exist on datanode1 -LINE 1: INSERT INTO collate_test5 SELECT * FROM collate_test1; - ^ SELECT a, b FROM collate_test5 ORDER BY b; -ERROR: relation "collate_test5" does not exist on datanode1 -LINE 1: SELECT a, b FROM collate_test5 ORDER BY b; - ^ + a | b +---+----- + 4 | ABD + 2 | Abc + 1 | abc + 3 | bbc +(4 rows) + SELECT a, b FROM collate_test1 ORDER BY b; a | b ---+----- @@ -299,27 +296,40 @@ SELECT a, CASE b WHEN 'abc' THEN 'abcd' ELSE b END FROM collate_test2 ORDER BY 2 (4 rows) CREATE DOMAIN testdomain AS text; -ERROR: domain is not yet supported. SELECT a, b::testdomain FROM collate_test1 ORDER BY 2; -ERROR: type "testdomain" does not exist -LINE 1: SELECT a, b::testdomain FROM collate_test1 ORDER BY 2; - ^ -CONTEXT: referenced column: b + a | b +---+----- + 4 | ABD + 2 | Abc + 1 | abc + 3 | bbc +(4 rows) + SELECT a, b::testdomain FROM collate_test2 ORDER BY 2; -ERROR: type "testdomain" does not exist -LINE 1: SELECT a, b::testdomain FROM collate_test2 ORDER BY 2; - ^ -CONTEXT: referenced column: b + a | b +---+----- + 4 | ABD + 2 | Abc + 1 | abc + 3 | bbc +(4 rows) + SELECT a, b::testdomain_p FROM collate_test2 ORDER BY 2; -ERROR: type "testdomain_p" does not exist -LINE 1: SELECT a, b::testdomain_p FROM collate_test2 ORDER BY 2; - ^ -CONTEXT: referenced column: b + a | b +---+----- + 4 | ABD + 2 | Abc + 1 | abc + 3 | bbc +(4 rows) + SELECT a, lower(x::testdomain), lower(y::testdomain) FROM collate_test10 ORDER BY 1, 2, 3; -ERROR: type "testdomain" does not exist -LINE 1: SELECT a, lower(x::testdomain), lower(y::testdomain) FROM co... - ^ -CONTEXT: referenced column: lower + a | lower | lower +---+-------+------- + 1 | hij | hij + 2 | hij | hij +(2 rows) + SELECT min(b), max(b) FROM collate_test1; min | max -----+----- @@ -608,14 +618,18 @@ explain (verbose, costs off, nodes off) SELECT collation for ((SELECT b FROM col -- must get rid of them. -- DROP SCHEMA collate_tests CASCADE; -NOTICE: drop cascades to 11 other objects +NOTICE: drop cascades to 15 other objects DETAIL: drop cascades to table collate_test1 drop cascades to table collate_test_like drop cascades to table collate_test2 +drop cascades to type testdomain_p +drop cascades to table collate_test4 +drop cascades to table collate_test5 drop cascades to table collate_test10 drop cascades to view collview1 drop cascades to view collview2 drop cascades to view collview3 +drop cascades to type testdomain drop cascades to function dup(anyelement) drop cascades to table collate_test20 drop cascades to table collate_test21 diff --git a/src/test/regress/expected/drop_if_exists.out b/src/test/regress/expected/drop_if_exists.out index f1c618497a99a592d691995d318c82c69f3375e9..012c26826d4f685851e90919fcb480fcc40cef88 100644 --- a/src/test/regress/expected/drop_if_exists.out +++ b/src/test/regress/expected/drop_if_exists.out @@ -58,9 +58,7 @@ ERROR: type "test_domain_exists" does not exist DROP DOMAIN IF EXISTS test_domain_exists; NOTICE: type "test_domain_exists" does not exist, skipping CREATE domain test_domain_exists as int not null check (value > 0); -ERROR: domain is not yet supported. DROP DOMAIN IF EXISTS test_domain_exists; -NOTICE: type "test_domain_exists" does not exist, skipping DROP DOMAIN test_domain_exists; ERROR: type "test_domain_exists" does not exist --- diff --git a/src/test/regress/expected/enum.out b/src/test/regress/expected/enum.out index 75c73ddbd90cbfd38858ccf2464d196ebe150bac..b28571e383f551f42efbc1ce34a8f8252a15a9d3 100644 --- a/src/test/regress/expected/enum.out +++ b/src/test/regress/expected/enum.out @@ -402,24 +402,19 @@ RESET enable_bitmapscan; -- Domains over enums -- CREATE DOMAIN rgb AS rainbow CHECK (VALUE IN ('red', 'green', 'blue')); -ERROR: domain is not yet supported. SELECT 'red'::rgb; -ERROR: type "rgb" does not exist -LINE 1: SELECT 'red'::rgb; - ^ -CONTEXT: referenced column: rgb + rgb +----- + red +(1 row) + SELECT 'purple'::rgb; -ERROR: type "rgb" does not exist -LINE 1: SELECT 'purple'::rgb; - ^ +ERROR: value for domain rgb violates check constraint "rgb_check" CONTEXT: referenced column: rgb SELECT 'purple'::rainbow::rgb; -ERROR: type "rgb" does not exist -LINE 1: SELECT 'purple'::rainbow::rgb; - ^ +ERROR: value for domain rgb violates check constraint "rgb_check" CONTEXT: referenced column: rgb DROP DOMAIN rgb; -ERROR: type "rgb" does not exist -- -- Arrays -- diff --git a/src/test/regress/expected/gtt_stats.out b/src/test/regress/expected/gtt_stats.out index 503a201afc65dcd10ded76107a5bc5b833053064..5e5b40c1a13d35015897ec9d1e1ac1727822340e 100644 --- a/src/test/regress/expected/gtt_stats.out +++ b/src/test/regress/expected/gtt_stats.out @@ -60,12 +60,12 @@ select * from pg_gtt_stats order by tablename, attname; gtt_stats | gtt | a | | | | | | | | | | | gtt_stats | gtt | b | | | | | | | | | | | gtt_stats | gtt_pkey | a | | | | | | | | | | | - pg_toast | pg_toast_16386 | chunk_data | | | | | | | | | | | - pg_toast | pg_toast_16386 | chunk_id | | | | | | | | | | | - pg_toast | pg_toast_16386 | chunk_seq | | | | | | | | | | | - pg_toast | pg_toast_16386_index | chunk_id | | | | | | | | | | | - pg_toast | pg_toast_16386_index | chunk_seq | | | | | | | | | | | -(22 rows) +--?pg_toast | pg_toast_.* | chunk_data | | | | | | | | | | | +--?pg_toast | pg_toast_.* | chunk_id | | | | | | | | | | | +--?pg_toast | pg_toast_.* | chunk_seq | | | | | | | | | | | +--?pg_toast | pg_toast_.*_index | chunk_id | | | | | | | | | | | +--?pg_toast | pg_toast_.*_index | chunk_seq | | | | | | | | | | | +(8 rows) reindex table gtt; reindex index gtt_pkey; @@ -83,12 +83,12 @@ select * from pg_gtt_stats order by tablename, attname; gtt_stats | gtt | a | f | 0 | 4 | -1 | | | {1,100,200,300,400,500,600,700,800,900,1000,1100,1200,1300,1400,1500,1600,1700,1800,1900,2000,2100,2200,2300,2400,2500,2600,2700,2800,2900,3000,3100,3200,3300,3400,3500,3600,3700,3800,3900,4000,4100,4200,4300,4400,4500,4600,4700,4800,4900,5000,5100,5200,5300,5400,5500,5600,5700,5800,5900,6000,6100,6200,6300,6400,6500,6600,6700,6800,6900,7000,7100,7200,7300,7400,7500,7600,7700,7800,7900,8000,8100,8200,8300,8400,8500,8600,8700,8800,8900,9000,9100,9200,9300,9400,9500,9600,9700,9800,9900,10000} | 1 | | | gtt_stats | gtt | b | f | 0 | 5 | 1 | {test} | {1} | | 1 | | | gtt_stats | gtt_pkey | a | | | | | | | | | | | - pg_toast | pg_toast_16386 | chunk_data | | | | | | | | | | | - pg_toast | pg_toast_16386 | chunk_id | | | | | | | | | | | - pg_toast | pg_toast_16386 | chunk_seq | | | | | | | | | | | - pg_toast | pg_toast_16386_index | chunk_id | | | | | | | | | | | - pg_toast | pg_toast_16386_index | chunk_seq | | | | | | | | | | | -(22 rows) +--?pg_toast | pg_toast_.* | chunk_data | | | | | | | | | | | +--?pg_toast | pg_toast_.* | chunk_id | | | | | | | | | | | +--?pg_toast | pg_toast_.* | chunk_seq | | | | | | | | | | | +--?pg_toast | pg_toast_.*_index | chunk_id | | | | | | | | | | | +--?pg_toast | pg_toast_.*_index | chunk_seq | | | | | | | | | | | +(8 rows) reset search_path; drop schema gtt_stats cascade; diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out index e33f8436d5e70e7af3cd5b13bdcceb7bde801ac0..77a81e872c6f0aac6f9819d2b6764ad7960b1ff9 100644 --- a/src/test/regress/expected/join.out +++ b/src/test/regress/expected/join.out @@ -3230,15 +3230,15 @@ INSERT INTO c VALUES (0), (1); INSERT INTO d VALUES (1,3), (2,2), (3,1); -- all three cases should be optimizable into a simple seqscan explain (verbose on, costs off, nodes off) SELECT a.* FROM a LEFT JOIN b ON a.b_id = b.id; - QUERY PLAN ----------------------------------------- +--?.*QUERY PLAN.* +--?----------------------------.* --? Seq Scan on pg_temp_datanod.* Output: a.id, a.b_id (2 rows) explain (verbose on, costs off, nodes off) SELECT b.* FROM b LEFT JOIN c ON b.c_id = c.id; - QUERY PLAN ----------------------------------------- +--?.*QUERY PLAN.* +--?----------------------------.* --? Seq Scan on pg_temp_datanod.* Output: b.id, b.c_id (2 rows) @@ -3246,8 +3246,8 @@ explain (verbose on, costs off, nodes off) SELECT b.* FROM b LEFT JOIN c ON b.c_ explain (verbose on, costs off, nodes off) SELECT a.* FROM a LEFT JOIN (b left join c on b.c_id = c.id) ON (a.b_id = b.id); - QUERY PLAN ----------------------------------------- +--?QUERY PLAN.* +--?-----------------------------.* --? Seq Scan on pg_temp_datanod.* Output: a.id, a.b_id (2 rows) @@ -3257,8 +3257,8 @@ explain (verbose on, costs off, nodes off) select id from a where id in ( select b.id from b left join c on b.id = c.id ); - QUERY PLAN ----------------------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Hash Join Output: a.id Hash Cond: (a.id = b.id) @@ -3275,8 +3275,8 @@ select id from a where id in ( explain (verbose on, costs off, nodes off) select d.* from d left join (select * from b group by b.id, b.c_id) s on d.a = s.id and d.b = s.c_id; - QUERY PLAN ----------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* --? Seq Scan on pg_temp_datanod.* Output: d.a, d.b (2 rows) @@ -3285,8 +3285,8 @@ select d.* from d left join (select * from b group by b.id, b.c_id) s explain (verbose on, costs off, nodes off) select d.* from d left join (select distinct * from b) s on d.a = s.id and d.b = s.c_id; - QUERY PLAN ----------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* --? Seq Scan on pg_temp_datanod.* Output: d.a, d.b (2 rows) @@ -3296,8 +3296,8 @@ select d.* from d left join (select distinct * from b) s explain (verbose on, costs off, nodes off) select d.* from d left join (select * from b group by b.id, b.c_id) s on d.a = s.id; - QUERY PLAN ----------------------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Hash Right Join Output: d.a, d.b Hash Cond: (b.id = d.a) @@ -3316,8 +3316,8 @@ select d.* from d left join (select * from b group by b.id, b.c_id) s explain (verbose on, costs off, nodes off) select d.* from d left join (select distinct * from b) s on d.a = s.id; - QUERY PLAN ----------------------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Hash Right Join Output: d.a, d.b Hash Cond: (b.id = d.a) @@ -3337,8 +3337,8 @@ select d.* from d left join (select distinct * from b) s explain (verbose on, costs off, nodes off) select d.* from d left join (select id from a union select id from b) s on d.a = s.id; - QUERY PLAN ----------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* --? Seq Scan on pg_temp_datanod.* Output: d.a, d.b (2 rows) @@ -3347,8 +3347,8 @@ select d.* from d left join (select id from a union select id from b) s explain (verbose on, costs off, nodes off) select i8.* from int8_tbl i8 left join (select f1 from int4_tbl group by f1) i4 on i8.q1 = i4.f1; - QUERY PLAN --------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Seq Scan on public.int8_tbl i8 Output: i8.q1, i8.q2 (2 rows) @@ -3371,8 +3371,8 @@ select p.* from parent p left join child c on (p.k = c.k) order by 1,2; explain (verbose on, costs off, nodes off) select p.* from parent p left join child c on (p.k = c.k) order by 1,2; - QUERY PLAN ------------------------------------------------------ +--?QUERY PLAN.* +--?----------------------------.* Sort Output: p.k, p.pd Sort Key: p.k, p.pd @@ -3395,8 +3395,8 @@ explain (verbose on, costs off, nodes off) select p.*, linked from parent p left join (select c.*, true as linked from child c) as ss on (p.k = ss.k) order by p.k; - QUERY PLAN ------------------------------------------------------------------------------ +--?QUERY PLAN.* +--?----------------------------.* Merge Left Join Output: p.k, p.pd, (true) Merge Cond: (p.k = c.k) @@ -3418,8 +3418,8 @@ explain (verbose on, costs off, nodes off) select p.* from parent p left join child c on (p.k = c.k) where p.k = 1 and p.k = 2; - QUERY PLAN --------------------------- +--?QUERY PLAN.* +--?----------------.* Result Output: p.k, p.pd One-Time Filter: false @@ -3519,8 +3519,8 @@ select t1.* from on (t1.f1 = b1.d1) left join int4_tbl i4 on (i8.q2 = i4.f1); - QUERY PLAN ----------------------------------------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Hash Left Join Output: t1.f1 Hash Cond: (i8.q2 = i4.f1) @@ -3586,8 +3586,8 @@ select t1.* from on (t1.f1 = b1.d1) left join int4_tbl i4 on (i8.q2 = i4.f1); - QUERY PLAN ----------------------------------------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Hash Left Join Output: t1.f1 Hash Cond: (i8.q2 = i4.f1) @@ -3652,8 +3652,8 @@ select * from on t1.f1 = 'doh!' left join int4_tbl i4 on i8.q1 = i4.f1; - QUERY PLAN --------------------------------------------------------------- +--?QUERY PLAN.* +--?----------------------------.* Nested Loop Left Join Output: t1.f1, i8.q1, i8.q2, t2.f1, i4.f1 -> Seq Scan on public.text_tbl t2 @@ -3700,8 +3700,8 @@ CREATE TABLE mj_t2 (a int,c char(10)); insert into mj_t2 values(12,'abcde'); insert into mj_t2 values(12,'efghi'); explain (nodes off, costs off) select * from mj_t1 full outer join mj_t2 on 1=1; - QUERY PLAN -------------------------------- +--?QUERY PLAN.* +--?-----------------------.* Merge Full Join -> Seq Scan on mj_t1 -> Materialize diff --git a/src/test/regress/expected/rangefuncs.out b/src/test/regress/expected/rangefuncs.out index 253635246a431982ef925129954dbb77772a2f40..0a3745376edc59ff3d20b757dde5310060fa89b4 100644 --- a/src/test/regress/expected/rangefuncs.out +++ b/src/test/regress/expected/rangefuncs.out @@ -71,7 +71,7 @@ SELECT name, setting FROM pg_settings WHERE name LIKE 'enable%' ORDER BY name; enable_sonic_optspill | on enable_sort | on enable_stream_replication | on - enable_thread_pool | on + enable_thread_pool | off enable_tidscan | on enable_upgrade_merge_lock_mode | off enable_user_metric_persistent | on diff --git a/src/test/regress/expected/single_node_enum.out b/src/test/regress/expected/single_node_enum.out index 041ebaf6d9fb27c6b94b18b8461d93b211133a2c..a7c80858dbb268ff651cbc84c8f432f1f2de783e 100644 --- a/src/test/regress/expected/single_node_enum.out +++ b/src/test/regress/expected/single_node_enum.out @@ -380,24 +380,19 @@ RESET enable_bitmapscan; -- Domains over enums -- CREATE DOMAIN rgb AS rainbow CHECK (VALUE IN ('red', 'green', 'blue')); -ERROR: domain is not yet supported. SELECT 'red'::rgb; -ERROR: type "rgb" does not exist -LINE 1: SELECT 'red'::rgb; - ^ -CONTEXT: referenced column: rgb + rgb +----- + red +(1 row) + SELECT 'purple'::rgb; -ERROR: type "rgb" does not exist -LINE 1: SELECT 'purple'::rgb; - ^ +ERROR: value for domain rgb violates check constraint "rgb_check" CONTEXT: referenced column: rgb SELECT 'purple'::rainbow::rgb; -ERROR: type "rgb" does not exist -LINE 1: SELECT 'purple'::rainbow::rgb; - ^ +ERROR: value for domain rgb violates check constraint "rgb_check" CONTEXT: referenced column: rgb DROP DOMAIN rgb; -ERROR: type "rgb" does not exist -- -- Arrays -- diff --git a/src/test/regress/expected/single_node_rangetypes.out b/src/test/regress/expected/single_node_rangetypes.out index 01c338fca7ec829c301ddb73492130fede14de58..171b90296ad760e1a6979043a19813d6c9b221c9 100644 --- a/src/test/regress/expected/single_node_rangetypes.out +++ b/src/test/regress/expected/single_node_rangetypes.out @@ -897,7 +897,6 @@ ERROR: table "float8range_test" does not exist -- Test range types over domains -- create domain mydomain as int4; -ERROR: domain is not yet supported. create type mydomainrange as range(subtype=mydomain); ERROR: user defined range type is not yet supported. select '[4,50)'::mydomainrange @> 7::mydomain; @@ -905,24 +904,21 @@ ERROR: type "mydomainrange" does not exist LINE 1: select '[4,50)'::mydomainrange @> 7::mydomain; ^ drop domain mydomain; -- fail -ERROR: type "mydomain" does not exist drop domain mydomain cascade; ERROR: type "mydomain" does not exist -- -- Test domains over range types -- create domain restrictedrange as int4range check (upper(value) < 10); -ERROR: domain is not yet supported. select '[4,5)'::restrictedrange @> 7; -ERROR: type "restrictedrange" does not exist -LINE 1: select '[4,5)'::restrictedrange @> 7; - ^ + ?column? +---------- + f +(1 row) + select '[4,50)'::restrictedrange @> 7; -- should fail -ERROR: type "restrictedrange" does not exist -LINE 1: select '[4,50)'::restrictedrange @> 7; - ^ +ERROR: value for domain restrictedrange violates check constraint "restrictedrange_check" drop domain restrictedrange; -ERROR: type "restrictedrange" does not exist -- -- Test multiple range types over the same subtype -- diff --git a/src/test/regress/expected/sqlLLT.out b/src/test/regress/expected/sqlLLT.out index 13d84c81b63f705a9d33666df6e66aadadf47d08..089358be230e5e9b951d47067cdad3712cf429c2 100644 --- a/src/test/regress/expected/sqlLLT.out +++ b/src/test/regress/expected/sqlLLT.out @@ -3205,7 +3205,6 @@ NOTICE: CREATE TABLE / PRIMARY KEY will create implicit index "t1_pkey" for tab create view alter_llt1.v1 as select * from alter_llt1.t1; create function alter_llt1.plus1(int) returns int as 'select $1+1' language sql; create domain alter_llt1.posint integer check (value > 0); -ERROR: domain is not yet supported. create type alter_llt1.ctype as (f1 int, f2 text); create function alter_llt1.same(alter_llt1.ctype, alter_llt1.ctype) returns boolean language sql as 'select $1.f1 is not distinct from $2.f1 and $1.f2 is not distinct from $2.f2';