Use null schema response for SYS TABLES command. (#46386)

(cherry picked from commit a6152f4)
elastic · Sep 7, 2019 · 7b26a8c · 7b26a8c
1 parent 7cf100b
commit 7b26a8c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_tables.sql b/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_tables.sql
@@ -9,7 +9,7 @@ CREATE TABLE mock (
   SELF_REFERENCING_COL_NAME VARCHAR,
   REF_GENERATION VARCHAR
 ) AS
-SELECT '', 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
 UNION ALL
-SELECT '', 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
 ;
diff --git a/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_types_of_table.sql b/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_types_of_table.sql
@@ -9,7 +9,7 @@ CREATE TABLE mock (
   SELF_REFERENCING_COL_NAME VARCHAR,
   REF_GENERATION VARCHAR
 ) AS
-SELECT '', 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
 UNION ALL
-SELECT '', 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
 ;
diff --git a/...gin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTables.java b/...gin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTables.java
@@ -146,7 +146,7 @@ public final void execute(SqlSession session, ActionListener<Page> listener) {
                  .sorted(Comparator.<IndexInfo, String> comparing(i -> legacyName(i.type()))
                            .thenComparing(Comparator.comparing(i -> i.name())))
                  .map(t -> asList(cluster,
-                         EMPTY,
+                         null,
                          t.name(),
                          legacyName(t.type()),
                          EMPTY,