You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by zs...@apache.org on 2022/12/20 06:25:30 UTC
[ignite-3] branch main updated: IGNITE-17271 Sort out sqlogic tests - Fixes #1449.
This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 600d230dec IGNITE-17271 Sort out sqlogic tests - Fixes #1449.
600d230dec is described below
commit 600d230decf66c33ec60a82b654882502c6a1bd6
Author: zstan <st...@gmail.com>
AuthorDate: Tue Dec 20 09:19:37 2022 +0300
IGNITE-17271 Sort out sqlogic tests - Fixes #1449.
Signed-off-by: zstan <st...@gmail.com>
---
.../aggregates/test_aggregate_types.test_ignore | 2 +-
...st_ignored => test_aggregate_types_scalar.test} | 31 ----------------------
.../test_aggregate_types_scalar.test_ignored | 3 ++-
.../test_distinct_string_agg.test_ignore | 2 +-
.../aggregates/test_perfect_ht.test_ignore | 2 +-
.../aggregates/test_string_agg.test_ignore | 2 +-
.../aggregates/test_string_agg_big.test_ignore | 2 +-
.../test_string_agg_many_groups.test_ignore | 2 +-
.../sql/aggregate/group/test_group_by.test | 16 -----------
.../sql/aggregate/group/test_group_by.test_ignore | 1 +
.../sql/aggregate/group/test_group_by_alias.test | 4 +--
.../sql/aggregate/group/test_group_null.test | 2 +-
.../sql/filter/test_obsolete_filters.test | 2 +-
.../sql/function/generic/test_coalesce.test | 2 +-
.../sql/function/interval/test_extract.test_ignore | 2 +-
.../sql/function/string/regex_search.test | 6 ++---
...{test_extract.test_ignore => test_extract.test} | 0
...extract_ms.test_ignore => test_extract_ms.test} | 0
.../timestamp/test_timestampadd.test_ignore | 2 +-
.../sql/insert/test_insert_type.test_ignore | 6 ++---
.../full_outer/test_full_outer_join_complex.test | 2 +-
.../test_full_outer_join_inequality.test | 2 +-
.../full_outer/test_full_outer_join_range.test | 2 +-
.../sql/join/test_complex_join_expr.test | 2 +-
.../sql/join/test_not_distinct_from.test | 8 +++---
.../order/test_order_same_value.test_slow_ignore | 2 +-
.../any_all/test_uncorrelated_all_subquery.test | 4 +--
.../exists/test_uncorrelated_exists_subquery.test | 6 ++---
.../scalar/test_complex_correlated_subquery.test | 16 +++++------
.../scalar/test_correlated_aggregate_subquery.test | 18 ++++++-------
.../subquery/scalar/test_correlated_subquery.test | 24 ++++++++---------
.../scalar/test_correlated_subquery_cte.test | 18 ++++++-------
.../subquery/scalar/test_count_star_subquery.test | 20 +++++++-------
.../scalar/test_uncorrelated_scalar_subquery.test | 4 +--
.../sql/types/blob/test_blob.test_ignore | 2 +-
.../sql/types/blob/test_blob_function.test_ignore | 2 +-
.../sql/types/blob/test_blob_operator.test_ignore | 2 +-
.../sql/types/blob/test_blob_string.test_ignore | 2 +-
.../sql/types/collections/array.test_ignore | 2 +-
.../sql/types/collections/array_agg.test_ignore | 2 +-
.../types/collections/array_agg.test_slow_ignore | 2 +-
.../sql/types/collections/map.test_ignore | 2 +-
..._decimal.test_ignore => cast_from_decimal.test} | 5 ++--
...to_decimal.test_ignore => cast_to_decimal.test} | 5 ++--
.../types/interval/interval_constants.test_ignore | 2 +-
.../interval/test_interval_addition.test_ignore | 2 +-
.../types/interval/test_interval_ops.test_ignore | 2 +-
.../sql/types/null/test_is_null.test_ignore | 4 +--
.../engine/exec/schema/SqlSchemaManagerTest.java | 2 +-
49 files changed, 104 insertions(+), 151 deletions(-)
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types.test_ignore
index 8dcab26664..97a68a23c9 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/aggregate/aggregates/test_aggregate_types.test
# description: Test aggregates with many different types
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
statement ok
CREATE TABLE strings(s VARCHAR, g INTEGER)
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test
similarity index 50%
copy from modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored
copy to modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test
index 168ef04f2f..1f0e754616 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test
@@ -1,7 +1,6 @@
# name: test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
# description: Test scalar aggregates with many different types
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
query IIIII
SELECT COUNT(1), COUNT(*), COUNT(NULL), COUNT('hello'), COUNT(DATE '1992-02-02')
@@ -40,33 +39,18 @@ SELECT SUM()
statement error
SELECT SUM(1, 2)
-query IIRTTTT
-SELECT MIN(1), MIN(NULL), MIN(33.3), MIN('hello'), MIN(True), MIN(DATE '1992-02-02'), MIN(TIMESTAMP '2008-01-01 00:00:01')
-----
-1 NULL 33.300000 hello true 1992-02-02 2008-01-01 00:00:01.0
-
statement error
SELECT MIN()
statement error
SELECT MIN(1, 2)
-query IIRTTTT
-SELECT MAX(1), MAX(NULL), MAX(33.3), MAX('hello'), MAX(True), MAX(DATE '1992-02-02'), MAX(TIMESTAMP '2008-01-01 00:00:01')
-----
-1 NULL 33.300000 hello true 1992-02-02 2008-01-01 00:00:01.0
-
statement error
SELECT MAX()
statement error
SELECT MAX(1, 2)
-query IIRTTTT
-SELECT ANY_VALUE(1), ANY_VALUE(NULL), ANY_VALUE(33.3), ANY_VALUE('hello'), ANY_VALUE(True), ANY_VALUE(DATE '1992-02-02'), ANY_VALUE(TIMESTAMP '2008-01-01 00:00:01')
-----
-1 NULL 33.300000 hello true 1992-02-02 2008-01-01 00:00:01.0
-
statement error
SELECT ANY_VALUE()
@@ -93,18 +77,3 @@ SELECT AVG()
statement error
SELECT AVG(1, 2)
-query T
-SELECT STRING_AGG('hello')
-----
-hello
-
-query TTTTT
-SELECT STRING_AGG('hello', ' '), STRING_AGG('hello', NULL), STRING_AGG(NULL, ' '), STRING_AGG(NULL, NULL), STRING_AGG('', '')
-----
-hello hello NULL NULL (empty)
-
-statement error
-SELECT STRING_AGG()
-
-statement error
-SELECT STRING_AGG(1, 2, 3)
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored
index 168ef04f2f..4df3229cd5 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_aggregate_types_scalar.test_ignored
@@ -1,7 +1,8 @@
# name: test/sql/aggregate/aggregates/test_aggregate_types_scalar.test
# description: Test scalar aggregates with many different types
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18362
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
query IIIII
SELECT COUNT(1), COUNT(*), COUNT(NULL), COUNT('hello'), COUNT(DATE '1992-02-02')
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore
index 090ba5d0b4..b19e9750c7 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_distinct_string_agg.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/aggregate/aggregates/test_distinct_string_agg.test
# description: Test distinct STRING_AGG operator
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
statement ok
CREATE TABLE strings(i INTEGER, s VARCHAR);
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_perfect_ht.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_perfect_ht.test_ignore
index 403e8d5f52..7d43624a29 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_perfect_ht.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_perfect_ht.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/aggregate/aggregates/test_perfect_ht.test
# description: Test aggregates that can trigger a perfect HT
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg.test_ignore
index a1a10beea4..b7c2ee6c8c 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/aggregate/aggregates/test_string_agg.test
# description: Test STRING_AGG operator
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
# test incorrect usage of STRING_AGG function
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_big.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_big.test_ignore
index a54e14a013..a73cab112b 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_big.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_big.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/aggregate/aggregates/test_string_agg_big.test
# description: STRING_AGG big
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
statement ok
CREATE TABLE strings AS SELECT c::VARCHAR g, (c*10+e)::INTEGER x FROM table(system_range(0, 99, 1)) t1(c), table(system_range(0, 99, 1)) t2(e);
diff --git a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_many_groups.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_many_groups.test_ignore
index a8ad9bf737..62bef2270f 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_many_groups.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/aggregates/test_string_agg_many_groups.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/aggregate/aggregates/test_string_agg_many_groups.test
# description: Test STRING_AGG operator with many groups
# group: [aggregates]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17268
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
# generate a table
diff --git a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test
index e1fbc5d64d..07c3d4dc9b 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test
+++ b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test
@@ -113,13 +113,6 @@ SELECT i, SUM(j), ANY_VALUE(j) FROM integers GROUP BY i ORDER BY i
2 4.000000 4
3 8.000000 4
-# use an alias that is identical to a column name (should prioritize column name)
-query IR
-SELECT 1 AS i, SUM(i) FROM integers GROUP BY i ORDER BY 2;
-----
-1 2.000000
-1 6.000000
-
statement ok
DROP TABLE integers;
@@ -138,15 +131,6 @@ NULL NULL
2 2.000000
3 3.000000
-# column reference should have preference over alias reference in grouping
-query IIR
-SELECT i, i % 2 AS i, SUM(i) FROM integers GROUP BY i ORDER BY 1 NULLS FIRST;
-----
-NULL NULL NULL
-1 1 1.000000
-2 0 2.000000
-3 1 3.000000
-
# aliases can only be referenced in the GROUP BY as the root column: operations not allowed
# CONTROVERSIAL: this query DOES work in SQLite
statement error
diff --git a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test_ignore b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test_ignore
index 22efd582ba..af852b137f 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test_ignore
+++ b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by.test_ignore
@@ -2,6 +2,7 @@
# description: Test aggregation/group by statements
# group: [group]
# Ignored: https://issues.apache.org/jira/browse/IGNITE-14885
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18412
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by_alias.test b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by_alias.test
index 4b70467bbf..f7b9c53fb5 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by_alias.test
+++ b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_by_alias.test
@@ -12,10 +12,10 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query IIR
SELECT i, i % 2 AS k, SUM(i) FROM integers GROUP BY i ORDER BY i;
----
-NULL NULL NULL
1 1 1.000000
2 0 2.000000
3 1 3.000000
+NULL NULL NULL
# cannot use GROUP BY column in an aggregation...
statement error
@@ -25,10 +25,10 @@ SELECT i % 2 AS k, SUM(k) FROM integers GROUP BY k
query IR
SELECT i, SUM(i) FROM integers GROUP BY i ORDER BY i
----
-NULL NULL
1 1.000000
2 2.000000
3 3.000000
+NULL NULL
# ORDER on a non-grouping column
# this query is refused by Postgres and MonetDB
diff --git a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_null.test b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_null.test
index a3afef6e99..8442df2f49 100644
--- a/modules/runner/src/integrationTest/sql/aggregate/group/test_group_null.test
+++ b/modules/runner/src/integrationTest/sql/aggregate/group/test_group_null.test
@@ -11,7 +11,7 @@ INSERT INTO integers VALUES (3, 4), (NULL, 4), (2, 4);
query IR
SELECT i, SUM(j) FROM integers GROUP BY i ORDER BY i
----
-NULL 4.000000
2 4.000000
3 4.000000
+NULL 4.000000
diff --git a/modules/runner/src/integrationTest/sql/filter/test_obsolete_filters.test b/modules/runner/src/integrationTest/sql/filter/test_obsolete_filters.test
index a8561b6f7d..4007f21837 100644
--- a/modules/runner/src/integrationTest/sql/filter/test_obsolete_filters.test
+++ b/modules/runner/src/integrationTest/sql/filter/test_obsolete_filters.test
@@ -14,12 +14,12 @@ INSERT INTO integers VALUES (1, 10), (2, 12), (3, 14), (4, 16), (5, NULL), (NULL
query II
SELECT * FROM integers WHERE TRUE ORDER BY 1
----
-NULL NULL
1 10
2 12
3 14
4 16
5 NULL
+NULL NULL
# Obsolete filters that can be pruned
query II
diff --git a/modules/runner/src/integrationTest/sql/function/generic/test_coalesce.test b/modules/runner/src/integrationTest/sql/function/generic/test_coalesce.test
index 14da577fb1..6c2f1aa7bd 100644
--- a/modules/runner/src/integrationTest/sql/function/generic/test_coalesce.test
+++ b/modules/runner/src/integrationTest/sql/function/generic/test_coalesce.test
@@ -47,6 +47,6 @@ INSERT INTO test3 VALUES (null, 22), (12, null), (13, 22)
query T
SELECT COALESCE(CAST(a AS VARCHAR), 11) FROM test3 ORDER BY a;
----
-11
12
13
+11
diff --git a/modules/runner/src/integrationTest/sql/function/interval/test_extract.test_ignore b/modules/runner/src/integrationTest/sql/function/interval/test_extract.test_ignore
index 75fb505ebc..50ecdf4a60 100644
--- a/modules/runner/src/integrationTest/sql/function/interval/test_extract.test_ignore
+++ b/modules/runner/src/integrationTest/sql/function/interval/test_extract.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/function/interval/test_extract.test
# description: Extract function
# group: [interval]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-17373
# YEAR-MONTH intervals
statement ok
diff --git a/modules/runner/src/integrationTest/sql/function/string/regex_search.test b/modules/runner/src/integrationTest/sql/function/string/regex_search.test
index fa3eb0922e..f949b548c3 100644
--- a/modules/runner/src/integrationTest/sql/function/string/regex_search.test
+++ b/modules/runner/src/integrationTest/sql/function/string/regex_search.test
@@ -84,18 +84,18 @@ INSERT INTO regex VALUES ('asdf', 'sd'), ('asdf', '^sd'), (NULL, '^sd'), ('asdf'
query T
SELECT s ~ '.*' FROM regex ORDER BY s
----
-NULL
true
true
true
+NULL
query T
SELECT s ~ p FROM regex order by s, p
----
-NULL
-NULL
false
true
+NULL
+NULL
# test regex with case sensitivity
query T
diff --git a/modules/runner/src/integrationTest/sql/function/timestamp/test_extract.test_ignore b/modules/runner/src/integrationTest/sql/function/timestamp/test_extract.test
similarity index 100%
rename from modules/runner/src/integrationTest/sql/function/timestamp/test_extract.test_ignore
rename to modules/runner/src/integrationTest/sql/function/timestamp/test_extract.test
diff --git a/modules/runner/src/integrationTest/sql/function/timestamp/test_extract_ms.test_ignore b/modules/runner/src/integrationTest/sql/function/timestamp/test_extract_ms.test
similarity index 100%
rename from modules/runner/src/integrationTest/sql/function/timestamp/test_extract_ms.test_ignore
rename to modules/runner/src/integrationTest/sql/function/timestamp/test_extract_ms.test
diff --git a/modules/runner/src/integrationTest/sql/function/timestamp/test_timestampadd.test_ignore b/modules/runner/src/integrationTest/sql/function/timestamp/test_timestampadd.test_ignore
index c5b2320b9f..d836b35a5b 100644
--- a/modules/runner/src/integrationTest/sql/function/timestamp/test_timestampadd.test_ignore
+++ b/modules/runner/src/integrationTest/sql/function/timestamp/test_timestampadd.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/function/test/test_timestampadd.test
# description: Just simple test to check support of timestampadd functions
# group: [timestamp]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18362
query T
SELECT TIMESTAMPADD(MICROSECOND, 10000, TIMESTAMP '2021-07-08 08:22:33.98');
diff --git a/modules/runner/src/integrationTest/sql/insert/test_insert_type.test_ignore b/modules/runner/src/integrationTest/sql/insert/test_insert_type.test_ignore
index 66c06080b5..0b999d2e7a 100644
--- a/modules/runner/src/integrationTest/sql/insert/test_insert_type.test_ignore
+++ b/modules/runner/src/integrationTest/sql/insert/test_insert_type.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/insert/test_insert_type.test
# description: Test insert into from wrong type
# group: [insert]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18365
statement ok
CREATE TABLE strings(a VARCHAR)
@@ -18,9 +18,9 @@ INSERT INTO strings SELECT * FROM integers
query T
SELECT * FROM strings ORDER BY 1
----
-NULL
3
4
+NULL
statement ok
UPDATE strings SET a=13 WHERE a=3
@@ -28,6 +28,6 @@ UPDATE strings SET a=13 WHERE a=3
query T
SELECT * FROM strings ORDER BY cast(a AS INTEGER)
----
-NULL
4
13
+NULL
diff --git a/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_complex.test b/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_complex.test
index 87587f1a2a..98bc731535 100644
--- a/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_complex.test
+++ b/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_complex.test
@@ -20,8 +20,8 @@ INSERT INTO integers2 VALUES (1, 10)
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i+integers2.k+9<>integers.j+integers2.l ORDER BY 1, 2, 3, 4
----
-NULL NULL 1 10
1 1 NULL NULL
+NULL NULL 1 10
# empty RHS
query IIII
diff --git a/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_inequality.test b/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_inequality.test
index 16197d7a9d..22b2c428d6 100644
--- a/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_inequality.test
+++ b/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_inequality.test
@@ -20,8 +20,8 @@ INSERT INTO integers2 VALUES (1, 10)
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i<>integers2.k ORDER BY 1, 2, 3, 4
----
-NULL NULL 1 10
1 1 NULL NULL
+NULL NULL 1 10
# empty RHS
query IIII
diff --git a/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_range.test b/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_range.test
index fdc602f4b0..468442e80f 100644
--- a/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_range.test
+++ b/modules/runner/src/integrationTest/sql/join/full_outer/test_full_outer_join_range.test
@@ -21,8 +21,8 @@ INSERT INTO integers2 VALUES (1, 10)
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i<integers2.k ORDER BY 1, 2, 3, 4
----
-NULL NULL 1 10
1 1 NULL NULL
+NULL NULL 1 10
# empty RHS
query IIII
diff --git a/modules/runner/src/integrationTest/sql/join/test_complex_join_expr.test b/modules/runner/src/integrationTest/sql/join/test_complex_join_expr.test
index 7b5c2c1468..23082fe86e 100644
--- a/modules/runner/src/integrationTest/sql/join/test_complex_join_expr.test
+++ b/modules/runner/src/integrationTest/sql/join/test_complex_join_expr.test
@@ -32,6 +32,6 @@ SELECT * FROM test LEFT JOIN test2 ON test.a+test2.c=test.b+test2.b ORDER BY 1
query IIII
SELECT * FROM test RIGHT JOIN test2 ON test.a+test2.c=test.b+test2.b ORDER BY 1
----
-NULL NULL 1 2
4 1 3 0
+NULL NULL 1 2
diff --git a/modules/runner/src/integrationTest/sql/join/test_not_distinct_from.test b/modules/runner/src/integrationTest/sql/join/test_not_distinct_from.test
index ce1f537b05..a5662eccef 100644
--- a/modules/runner/src/integrationTest/sql/join/test_not_distinct_from.test
+++ b/modules/runner/src/integrationTest/sql/join/test_not_distinct_from.test
@@ -29,12 +29,12 @@ NULL
query II
select a,tbl_2.b from tbl_1 inner join tbl_2 on (a IS DISTINCT FROM tbl_2.b) order by a,tbl_2.b
----
-NULL 1
-NULL 2
-1 NULL
1 2
-2 NULL
+1 NULL
2 1
+2 NULL
+NULL 1
+NULL 2
#Vector with vector
query III
diff --git a/modules/runner/src/integrationTest/sql/order/test_order_same_value.test_slow_ignore b/modules/runner/src/integrationTest/sql/order/test_order_same_value.test_slow_ignore
index 71d695b734..e80f4f8558 100644
--- a/modules/runner/src/integrationTest/sql/order/test_order_same_value.test_slow_ignore
+++ b/modules/runner/src/integrationTest/sql/order/test_order_same_value.test_slow_ignore
@@ -1,7 +1,7 @@
# name: test/sql/order/test_order_same_value.test_slow
# description: Test ordering the same value several times
# group: [order]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18379
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/subquery/any_all/test_uncorrelated_all_subquery.test b/modules/runner/src/integrationTest/sql/subquery/any_all/test_uncorrelated_all_subquery.test
index 2d0b2cc337..024c1d33cb 100644
--- a/modules/runner/src/integrationTest/sql/subquery/any_all/test_uncorrelated_all_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/any_all/test_uncorrelated_all_subquery.test
@@ -19,10 +19,10 @@ SELECT i FROM integers WHERE i >= ALL(SELECT i FROM integers)
query IT
SELECT i, i >= ALL(SELECT i FROM integers) FROM integers ORDER BY i
----
-NULL NULL
1 false
2 false
3 NULL
+NULL NULL
query I
SELECT i FROM integers WHERE i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL)
@@ -32,10 +32,10 @@ SELECT i FROM integers WHERE i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL
query IT
SELECT i, i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL) FROM integers ORDER BY i
----
-NULL NULL
1 false
2 false
3 true
+NULL NULL
query I
SELECT i FROM integers WHERE i >= ALL(SELECT i FROM integers WHERE i IS NOT NULL)
diff --git a/modules/runner/src/integrationTest/sql/subquery/exists/test_uncorrelated_exists_subquery.test b/modules/runner/src/integrationTest/sql/subquery/exists/test_uncorrelated_exists_subquery.test
index f688021a55..720a855b22 100644
--- a/modules/runner/src/integrationTest/sql/subquery/exists/test_uncorrelated_exists_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/exists/test_uncorrelated_exists_subquery.test
@@ -15,18 +15,18 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query I
SELECT * FROM integers WHERE EXISTS(SELECT 1) ORDER BY i
----
-NULL
1
2
3
+NULL
query I
SELECT * FROM integers WHERE EXISTS(SELECT * FROM integers) ORDER BY i
----
-NULL
1
2
3
+NULL
query I
SELECT * FROM integers WHERE NOT EXISTS(SELECT * FROM integers) ORDER BY i
@@ -35,10 +35,10 @@ SELECT * FROM integers WHERE NOT EXISTS(SELECT * FROM integers) ORDER BY i
query I
SELECT * FROM integers WHERE EXISTS(SELECT NULL) ORDER BY i
----
-NULL
1
2
3
+NULL
# exists in SELECT clause
query T
diff --git a/modules/runner/src/integrationTest/sql/subquery/scalar/test_complex_correlated_subquery.test b/modules/runner/src/integrationTest/sql/subquery/scalar/test_complex_correlated_subquery.test
index 5589b45a63..3b510fda17 100644
--- a/modules/runner/src/integrationTest/sql/subquery/scalar/test_complex_correlated_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/scalar/test_complex_correlated_subquery.test
@@ -15,37 +15,37 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query II
SELECT i, (SELECT s1.i FROM (SELECT * FROM integers WHERE i=i1.i) s1) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 1
2 2
3 3
+NULL NULL
# join on two subqueries that both have a correlated expression in them
query II
SELECT i, (SELECT s1.i FROM (SELECT i FROM integers WHERE i=i1.i) s1 INNER JOIN (SELECT i FROM integers WHERE i=4-i1.i) s2 ON s1.i>s2.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 NULL
2 NULL
3 3
+NULL NULL
# implicit join with correlated expression in filter
query II
SELECT i, (SELECT s1.i FROM integers s1, integers s2 WHERE s1.i=s2.i AND s1.i=4-i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 3
2 2
3 1
+NULL NULL
# join with a correlated expression in the join condition
query II
SELECT i, (SELECT s1.i FROM integers s1 INNER JOIN integers s2 ON s1.i=s2.i AND s1.i=4-i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 3
2 2
3 1
+NULL NULL
# left outer join on arbitrary correlated subquery: not supported
statement error
@@ -76,10 +76,10 @@ SELECT i, (SELECT row_number() OVER (ORDER BY i)) FROM integers i1 ORDER BY i;
query II
SELECT i, (SELECT i FROM integers WHERE i=i1.i UNION SELECT i FROM integers WHERE i=i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 1
2 2
3 3
+NULL NULL
# except with correlated expression
query II
@@ -93,26 +93,26 @@ SELECT i, (SELECT i FROM integers WHERE i IS NOT NULL EXCEPT SELECT i FROM integ
query II
SELECT i, (SELECT i FROM integers WHERE i=i1.i INTERSECT SELECT i FROM integers WHERE i=i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 1
2 2
3 3
+NULL NULL
# multiple setops
query II
SELECT i, (SELECT i FROM integers WHERE i=i1.i UNION SELECT i FROM integers WHERE i<>i1.i EXCEPT SELECT i FROM integers WHERE i<>i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 1
2 2
3 3
+NULL NULL
# uncorrelated query inside correlated query
query IR
SELECT i, (SELECT (SELECT SUM(i) FROM integers)+42+i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 49.000000
2 50.000000
3 51.000000
+NULL NULL
diff --git a/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_aggregate_subquery.test b/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_aggregate_subquery.test
index f81714e030..aa91abe0d4 100644
--- a/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_aggregate_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_aggregate_subquery.test
@@ -11,19 +11,19 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query II
SELECT i, (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i) FROM integers i1 ORDER BY i;
----
-NULL 0
1 2
2 1
3 0
+NULL 0
# aggregate with correlation inside aggregation
query II
SELECT i, (SELECT MIN(i+2*i1.i) FROM integers) FROM integers i1 ORDER BY i;
----
-NULL NULL
1 3
2 5
3 7
+NULL NULL
# this will fail, because "i" is not an aggregate but the SUM(i1.i) turns this query into an aggregate
statement error
@@ -42,27 +42,27 @@ SELECT SUM(i), SUM((SELECT i FROM integers WHERE i=i1.i)) FROM integers i1;
query II
SELECT i, (SELECT MIN(i) FROM integers WHERE i>i1.i) FROM integers i1 ORDER BY i;
----
-NULL NULL
1 2
2 3
3 NULL
+NULL NULL
# aggregate with correlation in GROUP BY
query II
SELECT i, (SELECT MIN(i) FROM integers GROUP BY i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL 1
1 1
2 1
3 1
+NULL 1
query R
SELECT (SELECT SUM(i)+SUM((CASE WHEN i IS NOT NULL THEN i*0 ELSE 0 END)+i1.i) FROM integers) FROM integers i1 ORDER BY 1;
----
-NULL
10.000000
14.000000
18.000000
+NULL
# subquery inside aggregate
query R
@@ -73,10 +73,10 @@ SELECT SUM((SELECT i+i1.i FROM integers WHERE i=1)) FROM integers i1;
query R
SELECT (SELECT SUM(i1.i*i) FROM integers) FROM integers i1 ORDER BY i;
----
-NULL
6.000000
12.000000
18.000000
+NULL
# correlated subquery in WHERE
query R
@@ -88,23 +88,23 @@ SELECT SUM(i) FROM integers i1 WHERE i>(SELECT (i+i1.i)/2 FROM integers WHERE i=
query IT
SELECT i, (SELECT MIN(i) FROM integers WHERE i=i1.i) >= ALL(SELECT i FROM integers WHERE i IS NOT NULL) FROM integers i1 ORDER BY i;
----
-NULL NULL
1 false
2 false
3 true
+NULL NULL
query IT
SELECT i, (SELECT MIN(i) FROM integers WHERE i<>i1.i) > ANY(SELECT i FROM integers WHERE i IS NOT NULL) FROM integers i1 ORDER BY i;
----
-NULL NULL
1 true
2 false
3 false
+NULL NULL
query IT
SELECT i, NOT((SELECT MIN(i) FROM integers WHERE i<>i1.i) > ANY(SELECT i FROM integers WHERE i IS NOT NULL)) FROM integers i1 ORDER BY i;
----
-NULL NULL
1 false
2 true
3 true
+NULL NULL
diff --git a/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery.test b/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery.test
index d1c3aed6b7..338f81c238 100644
--- a/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery.test
@@ -15,19 +15,19 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query II
SELECT i, (SELECT 42+i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 43
2 44
3 45
+NULL NULL
# ORDER BY correlated subquery
query I
SELECT i FROM integers i1 ORDER BY (SELECT 100-i1.i);
----
-NULL
3
2
1
+NULL
# subquery returning multiple results
statement error
@@ -37,46 +37,46 @@ SELECT i, (SELECT 42+i1.i FROM integers) AS j FROM integers i1 ORDER BY i;
query II
SELECT i, (SELECT 42+i1.i FROM integers LIMIT 1) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 43
2 44
3 45
+NULL NULL
# subquery with LIMIT 0
query II
SELECT i, (SELECT 42+i1.i FROM integers LIMIT 0) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 NULL
2 NULL
3 NULL
+NULL NULL
# subquery with WHERE clause that is always FALSE
query II
SELECT i, (SELECT i FROM integers WHERE 1=0 AND i1.i=i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 NULL
2 NULL
3 NULL
+NULL NULL
# correlated EXISTS with WHERE clause that is always FALSE
query IT
SELECT i, EXISTS(SELECT i FROM integers WHERE 1=0 AND i1.i=i) AS j FROM integers i1 ORDER BY i;
----
-NULL false
1 false
2 false
3 false
+NULL false
# correlated ANY with WHERE clause that is always FALSE
query IT
SELECT i, i=ANY(SELECT i FROM integers WHERE 1=0 AND i1.i=i) AS j FROM integers i1 ORDER BY i;
----
-NULL false
1 false
2 false
3 false
+NULL false
# subquery with OFFSET is not supported
statement error
@@ -94,44 +94,44 @@ SELECT i, (SELECT 42 WHERE i1.i>2) AS j FROM integers i1 ORDER BY i;
query II
SELECT i, (SELECT 42 FROM (VALUES(0)) WHERE i1.i IS NULL) AS j FROM integers i1 ORDER BY i;
----
-NULL 42
1 NULL
2 NULL
3 NULL
+NULL 42
# scalar select with correlation in projection
query II
SELECT i, (SELECT i+i1.i FROM integers WHERE i=1) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 2
2 3
3 4
+NULL NULL
# scalar select with correlation in filter
query II
SELECT i, (SELECT i FROM integers WHERE i=i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 1
2 2
3 3
+NULL NULL
# scalar select with operation in projection
query II
SELECT i, (SELECT i+1 FROM integers WHERE i=i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 2
2 3
3 4
+NULL NULL
# correlated scalar select with constant in projection
query II
SELECT i, (SELECT 42 FROM integers WHERE i=i1.i) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 42
2 42
3 42
+NULL NULL
diff --git a/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery_cte.test b/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery_cte.test
index adf36631a2..f4de5c45c3 100644
--- a/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery_cte.test
+++ b/modules/runner/src/integrationTest/sql/subquery/scalar/test_correlated_subquery_cte.test
@@ -15,10 +15,10 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query II
SELECT i, (WITH i2 AS (SELECT 42+i1.i AS j) SELECT j FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 43
2 44
3 45
+NULL NULL
# subquery returning multiple results
statement error
@@ -28,19 +28,19 @@ SELECT i, (WITH i2 AS (SELECT 42+i1.i AS j FROM integers) SELECT j FROM i2) AS j
query II
SELECT i, (WITH i2 AS (SELECT 42+i1.i AS j FROM integers) SELECT j FROM i2 LIMIT 1) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 43
2 44
3 45
+NULL NULL
# subquery with LIMIT 0
query II
SELECT i, (WITH i2 AS (SELECT 42+i1.i AS j FROM integers) SELECT j FROM i2 LIMIT 0) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 NULL
2 NULL
3 NULL
+NULL NULL
# subquery with WHERE clause that is always FALSE
query II
@@ -55,19 +55,19 @@ NULL NULL
query IT
SELECT i, EXISTS(WITH i2 AS (SELECT i FROM integers WHERE 1=0 AND i1.i=i) SELECT i FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL false
1 false
2 false
3 false
+NULL false
# correlated ANY with WHERE clause that is always FALSE
query IT
SELECT i, i=ANY(WITH i2 AS (SELECT i FROM integers WHERE 1=0 AND i1.i=i) SELECT i FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL false
1 false
2 false
3 false
+NULL false
# subquery with OFFSET is not supported
statement error
@@ -89,35 +89,35 @@ SELECT i, (WITH i2 AS (SELECT 42 WHERE i1.i IS NULL) SELECT * FROM i2) AS j FROM
query II
SELECT i, (WITH i2 AS (SELECT i+i1.i FROM integers WHERE i=1) SELECT * FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 2
2 3
3 4
+NULL NULL
# scalar select with correlation in filter
query II
SELECT i, (WITH i2 AS (SELECT i FROM integers WHERE i=i1.i) SELECT * FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 1
2 2
3 3
+NULL NULL
# scalar select with operation in projection
query II
SELECT i, (WITH i2 AS (SELECT i+1 FROM integers WHERE i=i1.i) SELECT * FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 2
2 3
3 4
+NULL NULL
# correlated scalar select with constant in projection
query II
SELECT i, (WITH i2 AS (SELECT 42 FROM integers WHERE i=i1.i) SELECT * FROM i2) AS j FROM integers i1 ORDER BY i;
----
-NULL NULL
1 42
2 42
3 42
+NULL NULL
diff --git a/modules/runner/src/integrationTest/sql/subquery/scalar/test_count_star_subquery.test b/modules/runner/src/integrationTest/sql/subquery/scalar/test_count_star_subquery.test
index 2f2be8606e..64ea5fab52 100644
--- a/modules/runner/src/integrationTest/sql/subquery/scalar/test_count_star_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/scalar/test_count_star_subquery.test
@@ -15,78 +15,78 @@ INSERT INTO integers VALUES (1), (2), (3), (NULL)
query II
SELECT i, (SELECT i FROM integers i2 WHERE i=(SELECT SUM(i) FROM integers i2 WHERE i2.i>i1.i)) FROM integers i1 ORDER BY 1;
----
-NULL NULL
1 NULL
2 3
3 NULL
+NULL NULL
query IT
SELECT i, (SELECT SUM(i) IS NULL FROM integers i2 WHERE i2.i>i1.i) FROM integers i1 ORDER BY i;
----
-NULL 1
1 0
2 0
3 1
+NULL 1
query II
SELECT i, (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i) FROM integers i1 ORDER BY i;
----
-NULL 0
1 2
2 1
3 0
+NULL 0
query II
SELECT i, (SELECT COUNT(i) FROM integers i2 WHERE i2.i>i1.i OR i2.i IS NULL) FROM integers i1 ORDER BY i;
----
-NULL 0
1 2
2 1
3 0
+NULL 0
query II
SELECT i, (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i OR i2.i IS NULL) FROM integers i1 ORDER BY i;
----
-NULL 1
1 3
2 2
3 1
+NULL 1
query II
SELECT i, (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i OR (i1.i IS NULL AND i2.i IS NULL)) FROM integers i1 ORDER BY i;
----
-NULL 1
1 2
2 1
3 0
+NULL 1
query I
SELECT i FROM integers i1 WHERE (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i)=0 ORDER BY i;
----
-NULL
3
+NULL
query II
SELECT i, (SELECT i FROM integers i2 WHERE i-2=(SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i)) FROM integers i1 ORDER BY 1;
----
-NULL 2
1 NULL
2 3
3 2
+NULL 2
query II
SELECT i, (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i GROUP BY i1.i) FROM integers i1 ORDER BY i;
----
-NULL NULL
1 2
2 1
3 NULL
+NULL NULL
query II
SELECT i, (SELECT COUNT(*) FROM integers i2 WHERE i2.i>i1.i) FROM integers i1 ORDER BY i;
----
-NULL 0
1 2
2 1
3 0
+NULL 0
diff --git a/modules/runner/src/integrationTest/sql/subquery/scalar/test_uncorrelated_scalar_subquery.test b/modules/runner/src/integrationTest/sql/subquery/scalar/test_uncorrelated_scalar_subquery.test
index 15687f1431..857f879e64 100644
--- a/modules/runner/src/integrationTest/sql/subquery/scalar/test_uncorrelated_scalar_subquery.test
+++ b/modules/runner/src/integrationTest/sql/subquery/scalar/test_uncorrelated_scalar_subquery.test
@@ -35,19 +35,19 @@ SELECT * FROM integers WHERE i=(SELECT MAX(i) FROM integers)
query II
SELECT *, (SELECT MAX(i) FROM integers) FROM integers ORDER BY i
----
-NULL 3
1 3
2 3
3 3
+NULL 3
# subquery as parameter to aggregate
query II
SELECT i, MAX((SELECT 42)) FROM integers GROUP BY i ORDER BY i
----
-NULL 42
1 42
2 42
3 42
+NULL 42
# scalar subquery returning zero results should result in NULL
query I
diff --git a/modules/runner/src/integrationTest/sql/types/blob/test_blob.test_ignore b/modules/runner/src/integrationTest/sql/types/blob/test_blob.test_ignore
index eeef03439a..2e49350af9 100644
--- a/modules/runner/src/integrationTest/sql/types/blob/test_blob.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/blob/test_blob.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/blob/test_blob.test
# description: BLOB tests
# group: [blob]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18373
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/blob/test_blob_function.test_ignore b/modules/runner/src/integrationTest/sql/types/blob/test_blob_function.test_ignore
index 801391cbf6..4a31af7431 100644
--- a/modules/runner/src/integrationTest/sql/types/blob/test_blob_function.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/blob/test_blob_function.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/blob/test_blob_function.test
# description: BLOB with Functions
# group: [blob]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18373
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/blob/test_blob_operator.test_ignore b/modules/runner/src/integrationTest/sql/types/blob/test_blob_operator.test_ignore
index af05d03bf8..ec790415ac 100644
--- a/modules/runner/src/integrationTest/sql/types/blob/test_blob_operator.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/blob/test_blob_operator.test_ignore
@@ -2,7 +2,7 @@
# description: Test BLOBs with various SQL operators
# group: [blob]
# Ignore https://issues.apache.org/jira/browse/IGNITE-15123
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18393
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/blob/test_blob_string.test_ignore b/modules/runner/src/integrationTest/sql/types/blob/test_blob_string.test_ignore
index d1f7059b2d..a9e741b89d 100644
--- a/modules/runner/src/integrationTest/sql/types/blob/test_blob_string.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/blob/test_blob_string.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/blob/test_blob_string.test
# description: Insert BLOB values from normal strings
# group: [blob]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18373
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/collections/array.test_ignore b/modules/runner/src/integrationTest/sql/types/collections/array.test_ignore
index 99724769a8..d451dd23b0 100644
--- a/modules/runner/src/integrationTest/sql/types/collections/array.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/collections/array.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/collections/array.test
# description: Test ARRAY creation query
# group: [collections]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
query T
SELECT ARRAY(SELECT * FROM (SELECT 1 UNION SELECT 2 UNION SELECT 3))
diff --git a/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_ignore b/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_ignore
index 0cfb3e5f25..2d99ada715 100644
--- a/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/collections/array_agg.test
# description: Test ARRAY_AGG and ARRAY_CONCAT_AGG function
# group: [collections]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
# scalar ARRAY_AGG
query II
diff --git a/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_slow_ignore b/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_slow_ignore
index 14a92c8222..771505bef2 100644
--- a/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_slow_ignore
+++ b/modules/runner/src/integrationTest/sql/types/collections/array_agg.test_slow_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/collections/array_agg.test_slow
# description: Test ARRAY_AGG function, slow tests
# group: [collections]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
statement ok
CREATE TABLE films(film_id INTEGER, title VARCHAR)
diff --git a/modules/runner/src/integrationTest/sql/types/collections/map.test_ignore b/modules/runner/src/integrationTest/sql/types/collections/map.test_ignore
index 88a9e7979f..2374156f45 100644
--- a/modules/runner/src/integrationTest/sql/types/collections/map.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/collections/map.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/collections/map.test
# description: Test MAP query
# group: [collect]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-14636
query T
SELECT MAP(SELECT * FROM (SELECT 1, 'test1' UNION SELECT 2, 'test2' UNION SELECT 3, 'test3'))
diff --git a/modules/runner/src/integrationTest/sql/types/decimal/cast_from_decimal.test_ignore b/modules/runner/src/integrationTest/sql/types/decimal/cast_from_decimal.test
similarity index 94%
rename from modules/runner/src/integrationTest/sql/types/decimal/cast_from_decimal.test_ignore
rename to modules/runner/src/integrationTest/sql/types/decimal/cast_from_decimal.test
index 4b3af21fad..3e1aa22f88 100644
--- a/modules/runner/src/integrationTest/sql/types/decimal/cast_from_decimal.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/decimal/cast_from_decimal.test
@@ -1,7 +1,6 @@
# name: test/sql/types/decimal/cast_from_decimal.test
# description: Test casting from decimal to numeric
# group: [decimal]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
statement ok
PRAGMA enable_verification
@@ -64,10 +63,10 @@ SELECT 14751947891758972421513::DECIMAL(38,0)::BIGINT
query IIIII
SELECT 127::DECIMAL(3,0)::FLOAT, -17014118346046923173168730371588410572::DECIMAL(38,0)::FLOAT, -7::DECIMAL(9,1)::FLOAT, 27::DECIMAL(18,1)::FLOAT, 33::DECIMAL(38,1)::FLOAT
----
-127 -1.7014119E37 -7 27 33
+127 -1.701412E37 -7 27 33
# double
query IIIII
SELECT 127::DECIMAL(3,0)::DOUBLE, -17014118346046923173168730371588410572::DECIMAL(38,0)::DOUBLE, -7::DECIMAL(9,1)::DOUBLE, 27::DECIMAL(18,1)::DOUBLE, 33::DECIMAL(38,1)::DOUBLE
----
-127 -1.7014118346046924E37 -7 27 33
+127 -1.701411834604692E37 -7 27 33
diff --git a/modules/runner/src/integrationTest/sql/types/decimal/cast_to_decimal.test_ignore b/modules/runner/src/integrationTest/sql/types/decimal/cast_to_decimal.test
similarity index 97%
rename from modules/runner/src/integrationTest/sql/types/decimal/cast_to_decimal.test_ignore
rename to modules/runner/src/integrationTest/sql/types/decimal/cast_to_decimal.test
index 72088f5e50..4758fb3353 100644
--- a/modules/runner/src/integrationTest/sql/types/decimal/cast_to_decimal.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/decimal/cast_to_decimal.test
@@ -1,7 +1,6 @@
# name: test/sql/types/decimal/cast_to_decimal.test
# description: Test casting from numeric to decimal
# group: [decimal]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17268
statement ok
PRAGMA enable_verification
@@ -140,7 +139,7 @@ SELECT 100::FLOAT::DECIMAL(18,3), 100::FLOAT::DECIMAL(3,0), (-100)::FLOAT::DECIM
query RRRR
SELECT 100::FLOAT::DECIMAL(38,35)::FLOAT, 100::FLOAT::DECIMAL(9,6)::FLOAT, 17014118346046923173168730371588410572::FLOAT::DECIMAL(38,0)::FLOAT, (-17014118346046923173168730371588410572)::FLOAT::DECIMAL(38,0)::FLOAT
----
-100 100 1.7014119E37 -1.7014119E37
+100 100 1.701412E37 -1.701412E37
query I
SELECT 1.25::FLOAT::DECIMAL(3,2)
@@ -193,7 +192,7 @@ SELECT 100::DOUBLE::DECIMAL(18,3), 100::DOUBLE::DECIMAL(3,0), (-100)::DOUBLE::DE
query RRRR
SELECT 100::DOUBLE::DECIMAL(38,35)::DOUBLE, 100::DOUBLE::DECIMAL(9,6)::DOUBLE, 17014118346046923173168730371588410572::DOUBLE::DECIMAL(38,0)::DOUBLE, (-17014118346046923173168730371588410572)::DOUBLE::DECIMAL(38,0)::DOUBLE
----
-100 100 1.7014118346046924E37 -1.7014118346046924E37
+100 100 1.701411834604692E37 -1.701411834604692E37
query I
SELECT 1.25::DOUBLE::DECIMAL(3,2)
diff --git a/modules/runner/src/integrationTest/sql/types/interval/interval_constants.test_ignore b/modules/runner/src/integrationTest/sql/types/interval/interval_constants.test_ignore
index 6b0bd7452a..d90fa38de3 100644
--- a/modules/runner/src/integrationTest/sql/types/interval/interval_constants.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/interval/interval_constants.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/interval/interval_constants.test
# description: Test constant intervals
# group: [interval]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18362
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/interval/test_interval_addition.test_ignore b/modules/runner/src/integrationTest/sql/types/interval/test_interval_addition.test_ignore
index 79bf47c354..d6ae6dce64 100644
--- a/modules/runner/src/integrationTest/sql/types/interval/test_interval_addition.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/interval/test_interval_addition.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/interval/test_interval_addition.test
# description: Test interval addition/subtraction
# group: [interval]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-18362
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/interval/test_interval_ops.test_ignore b/modules/runner/src/integrationTest/sql/types/interval/test_interval_ops.test_ignore
index 63c44360c6..a8e89e771f 100644
--- a/modules/runner/src/integrationTest/sql/types/interval/test_interval_ops.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/interval/test_interval_ops.test_ignore
@@ -1,7 +1,7 @@
# name: test/sql/types/interval/test_interval_ops.test
# description: Test various ops involving intervals
# group: [interval]
-# Ignored: https://issues.apache.org/jira/browse/IGNITE-17271
+# Ignored: https://issues.apache.org/jira/browse/IGNITE-17373
statement ok
PRAGMA enable_verification
diff --git a/modules/runner/src/integrationTest/sql/types/null/test_is_null.test_ignore b/modules/runner/src/integrationTest/sql/types/null/test_is_null.test_ignore
index a8dc4c60b7..21c073405e 100644
--- a/modules/runner/src/integrationTest/sql/types/null/test_is_null.test_ignore
+++ b/modules/runner/src/integrationTest/sql/types/null/test_is_null.test_ignore
@@ -11,14 +11,14 @@ INSERT INTO test VALUES (11, 1), (NULL, 2), (13, 3)
# IS NULL/IS NOT NULL
query TTTT
-SELECT a IS NULL, a IS NOT NULL, _key IS NULL, (a = NULL) IS NULL FROM test ORDER BY b
+SELECT a IS NULL, a IS NOT NULL, "__p_key" IS NULL, (a = NULL) IS NULL FROM test ORDER BY b
----
false true false true
true false false true
false true false true
query TTTT
-SELECT a IS NULL, a IS NOT NULL, _key IS NULL, (a = NULL) IS NULL FROM test WHERE b <> 1 ORDER BY b
+SELECT a IS NULL, a IS NOT NULL, "__p_key" IS NULL, (a = NULL) IS NULL FROM test WHERE b <> 1 ORDER BY b
----
true false false true
false true false true
diff --git a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
index d525384dfa..fd569c0b05 100644
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/schema/SqlSchemaManagerTest.java
@@ -187,7 +187,7 @@ public class SqlSchemaManagerTest {
public void testTableEventIsProcessedRequiredVersionIsLess() {
InternalTable mock = mock(InternalTable.class);
when(mock.tableId()).thenReturn(tableId);
- when(mock.name()).thenReturn("PUBLIC.T\"");
+ when(mock.name()).thenReturn("PUBLIC.T");
when(table.internalTable()).thenReturn(mock);
when(schemaRegistry.schema()).thenReturn(schemaDescriptor);