Skip to content

Commit 7b26a8c

Browse files
committed
Use null schema response for SYS TABLES command. (#46386)
(cherry picked from commit a6152f4)
1 parent 7cf100b commit 7b26a8c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_tables.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CREATE TABLE mock (
99
SELF_REFERENCING_COL_NAME VARCHAR,
1010
REF_GENERATION VARCHAR
1111
) AS
12-
SELECT '', 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
12+
SELECT null, 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
1313
UNION ALL
14-
SELECT '', 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
14+
SELECT null, 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
1515
;

x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_types_of_table.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CREATE TABLE mock (
99
SELF_REFERENCING_COL_NAME VARCHAR,
1010
REF_GENERATION VARCHAR
1111
) AS
12-
SELECT '', 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
12+
SELECT null, 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
1313
UNION ALL
14-
SELECT '', 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
14+
SELECT null, 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
1515
;

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTables.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public final void execute(SqlSession session, ActionListener<Page> listener) {
146146
.sorted(Comparator.<IndexInfo, String> comparing(i -> legacyName(i.type()))
147147
.thenComparing(Comparator.comparing(i -> i.name())))
148148
.map(t -> asList(cluster,
149-
EMPTY,
149+
null,
150150
t.name(),
151151
legacyName(t.type()),
152152
EMPTY,

0 commit comments

Comments
 (0)