conflicts

apache · Sep 10, 2020 · 3dd80b6 · 3dd80b6
1 parent d3dc77c
commit 3dd80b6
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 2 deletions.
diff --git a/sql/core/src/test/resources/sql-tests/inputs/interval.sql b/sql/core/src/test/resources/sql-tests/inputs/interval.sql
@@ -181,6 +181,14 @@ SELECT
   to_json(map('a', interval 25 month 100 day 130 minute)),
   from_json(to_json(map('a', interval 25 month 100 day 130 minute)), 'a interval');
 
+select interval '+';
+select interval '+.';
+select interval '1';
+select interval '1.2';
+select interval '- 2';
+select interval '1 day -';
+select interval '1 day 1';
+
 select interval '1 day 2' day;
 select interval 'interval 1' day;
 select interval '-\t 1' day;
diff --git a/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out b/sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 96
+-- Number of queries: 103
 
 
 -- !query
@@ -958,6 +958,62 @@ struct<from_json({"a":"1 days"}):struct<a:interval>,to_json(from_json({"a":"1 da
 {"a":1 days}	{"a":"1 days"}	{"a":"2 years 1 months 100 days 2 hours 10 minutes"}	{"a":2 years 1 months 100 days 2 hours 10 minutes}
 
 
+-- !query
+select interval '+'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '+.'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1.2'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '- 2'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1 day -'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1 day 1'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
 -- !query
 select interval '1 day 2' day
 -- !query schema

diff --git a/sql/core/src/test/resources/sql-tests/results/interval.sql.out b/sql/core/src/test/resources/sql-tests/results/interval.sql.out
@@ -1,5 +1,5 @@
 -- Automatically generated by SQLQueryTestSuite
--- Number of queries: 96
+-- Number of queries: 103
 
 
 -- !query
@@ -930,6 +930,62 @@ struct<from_json({"a":"1 days"}):struct<a:interval>,to_json(from_json({"a":"1 da
 {"a":1 days}	{"a":"1 days"}	{"a":"2 years 1 months 100 days 2 hours 10 minutes"}	{"a":2 years 1 months 100 days 2 hours 10 minutes}
 
 
+-- !query
+select interval '+'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '+.'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1.2'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '- 2'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1 day -'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
+-- !query
+select interval '1 day 1'
+-- !query schema
+struct<CAST(NULL AS INTERVAL):interval>
+-- !query output
+NULL
+
+
 -- !query
 select interval '1 day 2' day
 -- !query schema