From c49d2f3c06adb4a6490d0a33a6aee7dfc6888543 Mon Sep 17 00:00:00 2001 From: dengxuyue Date: Thu, 18 Mar 2021 07:52:37 +0800 Subject: [PATCH] fix LLT after dual removal --- src/test/regress/expected/hw_datatype.out | 8 ++++---- src/test/regress/expected/hw_functions.out | 20 +++++++++---------- src/test/regress/expected/resolve_unknown.out | 6 ++---- src/test/regress/sql/hw_datatype.sql | 8 ++++---- src/test/regress/sql/hw_functions.sql | 20 +++++++++---------- 5 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/test/regress/expected/hw_datatype.out b/src/test/regress/expected/hw_datatype.out index 950f0aa0f..8b1a4c1e9 100644 --- a/src/test/regress/expected/hw_datatype.out +++ b/src/test/regress/expected/hw_datatype.out @@ -2010,28 +2010,28 @@ select 2 > '15'::text; SELECT pg_catalog.array_dims(' '::anyarray) AS a ,LENGTH(pg_catalog.array_dims(' '::anyarray)) AS b -FROM dual; +; ERROR: array value must start with "{" or dimension information LINE 1: SELECT pg_catalog.array_dims(' '::anyarray) AS a ^ CONTEXT: referenced column: a SELECT pg_catalog.array_to_string(' '::anyarray,' '::text) AS a ,LENGTH(pg_catalog.array_to_string(' '::anyarray,' '::text)) AS b -FROM dual; +; ERROR: array value must start with "{" or dimension information LINE 1: SELECT pg_catalog.array_to_string(' '::anyarray,' '::text) A... ^ CONTEXT: referenced column: a SELECT pg_catalog.array_to_string(' '::anyarray,' '::text,''::text) AS a ,LENGTH(pg_catalog.array_to_string(' '::anyarray,' '::text,' '::text)) AS b -FROM dual; +; ERROR: array value must start with "{" or dimension information LINE 1: SELECT pg_catalog.array_to_string(' '::anyarray,' '::text,''... ^ CONTEXT: referenced column: a SELECT pg_catalog.array_dims('{1,2,3}'::anyarray) AS a ,LENGTH(pg_catalog.array_dims('{1,2,3}'::anyarray)) AS b -FROM dual; +; ERROR: array value must start with "{" or dimension information LINE 1: SELECT pg_catalog.array_dims('{1,2,3}'::anyarray) AS a ^ diff --git a/src/test/regress/expected/hw_functions.out b/src/test/regress/expected/hw_functions.out index a2e7ec3bf..c5799ddb0 100644 --- a/src/test/regress/expected/hw_functions.out +++ b/src/test/regress/expected/hw_functions.out @@ -238,61 +238,61 @@ select numtodsinterval(-.1500321234,'second'); (1 row) --boundary test -SELECT numtodsinterval(-2147483648, 'DAY')from dual; +SELECT numtodsinterval(-2147483648, 'DAY'); numtodsinterval --------------------------------- --2147483648 00:00:00.000000000 (1 row) -SELECT numtodsinterval(-2147483648, 'HOUR')from dual; +SELECT numtodsinterval(-2147483648, 'HOUR'); numtodsinterval ------------------------------- -089478485 08:00:00.000000000 (1 row) -SELECT numtodsinterval(-2147483648, 'MINUTE')from dual; +SELECT numtodsinterval(-2147483648, 'MINUTE'); numtodsinterval ------------------------------- -001491308 02:08:00.000000000 (1 row) -SELECT numtodsinterval(-2147483648, 'SECOND')from dual; +SELECT numtodsinterval(-2147483648, 'SECOND'); numtodsinterval ------------------------------- -000024855 03:14:08.000000000 (1 row) -SELECT numtodsinterval(2147483647, 'DAY')from dual; +SELECT numtodsinterval(2147483647, 'DAY'); numtodsinterval -------------------------------- +2147483647 00:00:00.000000000 (1 row) -SELECT numtodsinterval(999999999.99999999999, 'DAY')from dual; +SELECT numtodsinterval(999999999.99999999999, 'DAY'); numtodsinterval ------------------------------- +999999999 23:59:59.999999000 (1 row) -SELECT numtodsinterval(2147483647, 'HOUR')from dual; +SELECT numtodsinterval(2147483647, 'HOUR'); numtodsinterval ------------------------------- +089478485 07:00:00.000000000 (1 row) -SELECT numtodsinterval(2147483647, 'MINUTE')from dual; +SELECT numtodsinterval(2147483647, 'MINUTE'); numtodsinterval ------------------------------- +001491308 02:07:00.000000000 (1 row) -SELECT numtodsinterval(2147483647, 'SECOND')from dual; +SELECT numtodsinterval(2147483647, 'SECOND'); numtodsinterval ------------------------------- +000024855 03:14:07.000000000 (1 row) -SELECT numtodsinterval(123456789.123456789, 'DAY')from dual; +SELECT numtodsinterval(123456789.123456789, 'DAY'); numtodsinterval ------------------------------- +123456789 02:57:46.666570000 diff --git a/src/test/regress/expected/resolve_unknown.out b/src/test/regress/expected/resolve_unknown.out index 44c6fe6ae..b3cf83e94 100644 --- a/src/test/regress/expected/resolve_unknown.out +++ b/src/test/regress/expected/resolve_unknown.out @@ -40,11 +40,9 @@ explain (verbose on, costs off) select 1 where 'vasya' = (select 'vasya' as col1 Output: 1 One-Time Filter: ('vasya'::text = $0) InitPlan 1 (returns $0) - -> Subquery Scan on dual + -> Result Output: 'vasya'::text - -> Result - Output: 'X'::text -(8 rows) +(6 rows) select 1 where 'vasya' = (select 'vasya' as col1); ?column? diff --git a/src/test/regress/sql/hw_datatype.sql b/src/test/regress/sql/hw_datatype.sql index 0e43fda32..2dd336fc5 100644 --- a/src/test/regress/sql/hw_datatype.sql +++ b/src/test/regress/sql/hw_datatype.sql @@ -964,13 +964,13 @@ select 2 > '15'::text; SELECT pg_catalog.array_dims(' '::anyarray) AS a ,LENGTH(pg_catalog.array_dims(' '::anyarray)) AS b -FROM dual; +; SELECT pg_catalog.array_to_string(' '::anyarray,' '::text) AS a ,LENGTH(pg_catalog.array_to_string(' '::anyarray,' '::text)) AS b -FROM dual; +; SELECT pg_catalog.array_to_string(' '::anyarray,' '::text,''::text) AS a ,LENGTH(pg_catalog.array_to_string(' '::anyarray,' '::text,' '::text)) AS b -FROM dual; +; SELECT pg_catalog.array_dims('{1,2,3}'::anyarray) AS a ,LENGTH(pg_catalog.array_dims('{1,2,3}'::anyarray)) AS b -FROM dual; +; diff --git a/src/test/regress/sql/hw_functions.sql b/src/test/regress/sql/hw_functions.sql index a5a080bb5..405f8b32e 100644 --- a/src/test/regress/sql/hw_functions.sql +++ b/src/test/regress/sql/hw_functions.sql @@ -106,16 +106,16 @@ select numtodsinterval(-0.1,'HOUR'); select numtodsinterval(150032,'second'); select numtodsinterval(-.1500321234,'second'); --boundary test -SELECT numtodsinterval(-2147483648, 'DAY')from dual; -SELECT numtodsinterval(-2147483648, 'HOUR')from dual; -SELECT numtodsinterval(-2147483648, 'MINUTE')from dual; -SELECT numtodsinterval(-2147483648, 'SECOND')from dual; -SELECT numtodsinterval(2147483647, 'DAY')from dual; -SELECT numtodsinterval(999999999.99999999999, 'DAY')from dual; -SELECT numtodsinterval(2147483647, 'HOUR')from dual; -SELECT numtodsinterval(2147483647, 'MINUTE')from dual; -SELECT numtodsinterval(2147483647, 'SECOND')from dual; -SELECT numtodsinterval(123456789.123456789, 'DAY')from dual; +SELECT numtodsinterval(-2147483648, 'DAY'); +SELECT numtodsinterval(-2147483648, 'HOUR'); +SELECT numtodsinterval(-2147483648, 'MINUTE'); +SELECT numtodsinterval(-2147483648, 'SECOND'); +SELECT numtodsinterval(2147483647, 'DAY'); +SELECT numtodsinterval(999999999.99999999999, 'DAY'); +SELECT numtodsinterval(2147483647, 'HOUR'); +SELECT numtodsinterval(2147483647, 'MINUTE'); +SELECT numtodsinterval(2147483647, 'SECOND'); +SELECT numtodsinterval(123456789.123456789, 'DAY'); SELECT '2147483647 days 24 hours'::interval; set intervalstyle=postgres;