SQL: drop BASE TABLE type in favour for just TABLE (#54836) (#54951)

bpintea · web-flow · commit 8d6d7b88d8a4 · 2020-04-08T16:02:12.000+02:00
* Drop BASE TABLE type in favour for just TABLE This commit drops the table type 'BASE TABLE' and replaces all occurences with just 'TABLE', since his type is wider-used and friendlier to the client applications that query for certain table types in their discovery mode. The 'TABLE' type is also explicitely mentioned by the JDBC and ODBC standards and although other data source-specific types are permitted, older apps will not work well with them. * Refactor table type constants out of IndexType Move SQL_TABLE/_ALIAS out of IndexType, so that they can also be used in that Enum definition. (cherry picked from commit 70241b5)
diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/index/IndexResolver.java
@@ -76,19 +76,14 @@
 public class IndexResolver {
 
     public enum IndexType {
-        STANDARD_INDEX("BASE TABLE", "INDEX"),
-        ALIAS("VIEW", "ALIAS"),
-        FROZEN_INDEX("BASE TABLE", "FROZEN INDEX"),
+        STANDARD_INDEX(SQL_TABLE, "INDEX"),
+        ALIAS(SQL_VIEW, "ALIAS"),
+        FROZEN_INDEX(SQL_TABLE, "FROZEN INDEX"),
         // value for user types unrecognized
         UNKNOWN("UNKNOWN", "UNKNOWN");
 
-        public static final String SQL_BASE_TABLE = "BASE TABLE";
-        public static final String SQL_TABLE = "TABLE";
-        public static final String SQL_VIEW = "VIEW";
-
         public static final EnumSet<IndexType> VALID_INCLUDE_FROZEN = EnumSet.of(STANDARD_INDEX, ALIAS, FROZEN_INDEX);
         public static final EnumSet<IndexType> VALID_REGULAR = EnumSet.of(STANDARD_INDEX, ALIAS);
-        public static final EnumSet<IndexType> INDICES_ONLY = EnumSet.of(STANDARD_INDEX, FROZEN_INDEX);
 
         private final String toSql;
         private final String toNative;
@@ -150,6 +145,9 @@ public boolean equals(Object obj) {
         }
     }
 
+    public static final String SQL_TABLE = "TABLE";
+    public static final String SQL_VIEW = "VIEW";
+
     private static final IndicesOptions INDICES_ONLY_OPTIONS = new IndicesOptions(
             EnumSet.of(Option.ALLOW_NO_INDICES, Option.IGNORE_UNAVAILABLE, Option.IGNORE_ALIASES, Option.IGNORE_THROTTLED),
             EnumSet.of(WildcardStates.OPEN));
diff --git a/x-pack/plugin/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/RestSqlSecurityIT.java b/x-pack/plugin/sql/qa/security/src/test/java/org/elasticsearch/xpack/sql/qa/security/RestSqlSecurityIT.java
@@ -133,7 +133,7 @@ public void expectShowTables(List<String> tables, String user) throws Exception
             for (String table : tables) {
                 List<String> fields = new ArrayList<>();
                 fields.add(table);
-                fields.add("BASE TABLE");
+                fields.add("TABLE");
                 fields.add("INDEX");
                 rows.add(fields);
             }
diff --git a/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/DatabaseMetaDataTestCase.java b/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/DatabaseMetaDataTestCase.java
@@ -98,11 +98,11 @@ public void testGetTypeOfTables() throws Exception {
 
             CheckedSupplier<ResultSet, SQLException> all = () -> h2.createStatement()
                     .executeQuery("SELECT '" + clusterName() + "' AS TABLE_CAT, * FROM mock");
-            assertResultSets(all.get(), es.getMetaData().getTables("%", "%", "%", new String[] { "BASE TABLE" }));
+            assertResultSets(all.get(), es.getMetaData().getTables("%", "%", "%", new String[] { "TABLE" }));
             assertResultSets(
                     h2.createStatement()
                             .executeQuery("SELECT '" + clusterName() + "' AS TABLE_CAT, * FROM mock WHERE TABLE_NAME = 'test1'"),
-                    es.getMetaData().getTables("%", "%", "test1", new String[] { "BASE TABLE" }));
+                    es.getMetaData().getTables("%", "%", "test1", new String[] { "TABLE" }));
         }
     }
 
diff --git a/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/ShowTablesTestCase.java b/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/ShowTablesTestCase.java
@@ -30,7 +30,7 @@ public void testShowTablesWithManyIndices() throws Exception {
             for (int i = 0; i < indices; i++) {
                 String index = String.format(Locale.ROOT, "test%02d", i);
                 index(index, builder -> builder.field("name", "bob"));
-                h2.createStatement().executeUpdate("INSERT INTO mock VALUES ('" + index + "', 'BASE TABLE', 'INDEX');");
+                h2.createStatement().executeUpdate("INSERT INTO mock VALUES ('" + index + "', 'TABLE', 'INDEX');");
             }
 
             ResultSet expected = h2.createStatement().executeQuery("SELECT * FROM mock ORDER BY name");
@@ -44,8 +44,8 @@ public void testEmptyIndex() throws Exception {
 
         try (Connection h2 = LocalH2.anonymousDb(); Connection es = esJdbc()) {
             h2.createStatement().executeUpdate("RUNSCRIPT FROM 'classpath:/setup_mock_show_tables.sql'");
-            h2.createStatement().executeUpdate("INSERT INTO mock VALUES ('test_empty', 'BASE TABLE', 'INDEX');");
-            h2.createStatement().executeUpdate("INSERT INTO mock VALUES ('test_empty_again', 'BASE TABLE', 'INDEX');");
+            h2.createStatement().executeUpdate("INSERT INTO mock VALUES ('test_empty', 'TABLE', 'INDEX');");
+            h2.createStatement().executeUpdate("INSERT INTO mock VALUES ('test_empty_again', 'TABLE', 'INDEX');");
 
             ResultSet expected = h2.createStatement().executeQuery("SELECT * FROM mock");
             assertResultSets(expected, es.createStatement().executeQuery("SHOW TABLES"));
diff --git a/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/alias.csv-spec
@@ -94,12 +94,12 @@ test_alias           | VIEW    | ALIAS
 showPattern
 SHOW TABLES LIKE 'test_%';
 
-name:s               | type:s      | kind :s
+name:s               | type:s | kind :s
 
-test_alias           | VIEW        | ALIAS
-test_alias_emp       | VIEW        | ALIAS
-test_emp             | BASE TABLE  | INDEX
-test_emp_copy        | BASE TABLE  | INDEX
+test_alias           | VIEW   | ALIAS
+test_alias_emp       | VIEW   | ALIAS
+test_emp             | TABLE  | INDEX
+test_emp_copy        | TABLE  | INDEX
 ;
 
 groupByOnAlias
diff --git a/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/command.csv-spec
@@ -214,41 +214,41 @@ TODAY          |SCALAR
 showTables
 SHOW TABLES;
 
-       name    |     type   |  kind   
-logs           |BASE TABLE  |INDEX
-test_alias     |VIEW        |ALIAS
-test_alias_emp |VIEW        |ALIAS 
-test_emp       |BASE TABLE  |INDEX  
-test_emp_copy  |BASE TABLE  |INDEX  
+       name    |  type |  kind   
+logs           |TABLE  |INDEX
+test_alias     |VIEW   |ALIAS
+test_alias_emp |VIEW   |ALIAS 
+test_emp       |TABLE  |INDEX  
+test_emp_copy  |TABLE  |INDEX  
 ;
 
 showTablesSimpleLike
 SHOW TABLES LIKE 'test_emp';
 
- name:s        | type:s     | kind:s
-test_emp       |BASE TABLE  |INDEX
+ name:s        | type:s| kind:s
+test_emp       |TABLE  |INDEX
 ;
 
 showTablesMultiLike
 SHOW TABLES LIKE 'test_emp%';
 
- name:s        | type:s    |kind:s
-test_emp       |BASE TABLE |INDEX     
-test_emp_copy  |BASE TABLE |INDEX     
+ name:s        |type:s |kind:s
+test_emp       |TABLE  |INDEX     
+test_emp_copy  |TABLE  |INDEX     
 ;
 
 showTablesIdentifier
 SHOW TABLES "test_emp";
 
- name:s        | type:s     |kind:s
-test_emp       |BASE TABLE  |INDEX
+ name:s        |type:s |kind:s
+test_emp       |TABLE  |INDEX
 ;
 
 showTablesIdentifierPattern
 SHOW TABLES "test_e*,-test_emp";
 
- name:s        | type:s    |kind:s
-test_emp_copy  |BASE TABLE |INDEX
+ name:s        |type:s |kind:s
+test_emp_copy  |TABLE  |INDEX
 ;
 
 showTablesIdentifierPatternOnAliases
diff --git a/x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/docs/docs.csv-spec
@@ -95,11 +95,11 @@ showTables
 // tag::showTables
 SHOW TABLES;
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-emp            |BASE TABLE     |INDEX          
-employees      |VIEW           |ALIAS          
-library        |BASE TABLE     |INDEX    
+     name      | type     |     kind      
+---------------+----------+---------------
+emp            |TABLE     |INDEX          
+employees      |VIEW      |ALIAS          
+library        |TABLE     |INDEX    
 
 // end::showTables
 ;
@@ -108,9 +108,9 @@ showTablesLikeExact
 // tag::showTablesLikeExact
 SHOW TABLES LIKE 'emp';
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-emp            |BASE TABLE     |INDEX    
+     name      | type     |     kind      
+---------------+----------+---------------
+emp            |TABLE     |INDEX    
 
 // end::showTablesLikeExact
 ;
@@ -119,10 +119,10 @@ showTablesLikeWildcard
 // tag::showTablesLikeWildcard
 SHOW TABLES LIKE 'emp%';
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-emp            |BASE TABLE     |INDEX          
-employees      |VIEW           |ALIAS             
+     name      | type     |     kind      
+---------------+----------+---------------
+emp            |TABLE     |INDEX          
+employees      |VIEW      |ALIAS             
 
 // end::showTablesLikeWildcard
 ;
@@ -132,9 +132,9 @@ showTablesLikeOneChar
 // tag::showTablesLikeOneChar
 SHOW TABLES LIKE 'em_';
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-emp            |BASE TABLE     |INDEX     
+     name      | type     |     kind      
+---------------+----------+---------------
+emp            |TABLE     |INDEX     
 
 // end::showTablesLikeOneChar
 ;
@@ -143,9 +143,9 @@ showTablesLikeMixed
 // tag::showTablesLikeMixed
 SHOW TABLES LIKE '%em_';
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-emp            |BASE TABLE     |INDEX        
+     name      | type     |     kind      
+---------------+----------+---------------
+emp            |TABLE     |INDEX        
 
 // end::showTablesLikeMixed
 ;
@@ -166,10 +166,10 @@ showTablesEsMultiIndex
 // tag::showTablesEsMultiIndex
 SHOW TABLES "*,-l*";
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-emp            |BASE TABLE     |INDEX          
-employees      |VIEW           |ALIAS  
+     name      | type     |     kind      
+---------------+----------+---------------
+emp            |TABLE     |INDEX          
+employees      |VIEW      |ALIAS  
 
 // end::showTablesEsMultiIndex
 ;
@@ -182,12 +182,12 @@ showTablesIncludeFrozen
 // tag::showTablesIncludeFrozen
 SHOW TABLES INCLUDE FROZEN;
 
-     name      |     type      |     kind      
----------------+---------------+---------------
-archive        |BASE TABLE     |FROZEN INDEX
-emp            |BASE TABLE     |INDEX          
-employees      |VIEW           |ALIAS          
-library        |BASE TABLE     |INDEX    
+     name      | type     |     kind      
+---------------+----------+---------------
+archive        |TABLE     |FROZEN INDEX
+emp            |TABLE     |INDEX          
+employees      |VIEW      |ALIAS          
+library        |TABLE     |INDEX    
 
 // end::showTablesIncludeFrozen
 ;
diff --git a/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/geo/geosql.csv-spec
@@ -7,8 +7,8 @@
 showTables
 SHOW TABLES "geo";
 
- name:s        | type:s     | kind:s
-geo            |BASE TABLE  |INDEX
+ name:s        | type:s| kind:s
+geo            |TABLE  |INDEX
 ;
 
 // DESCRIBE
diff --git a/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/ogc/ogc.csv-spec
@@ -7,8 +7,8 @@
 showTables
 SHOW TABLES "ogc";
 
- name:s        | type:s      | kind:s
-ogc            |BASE TABLE   |INDEX
+ name:s        | type:s | kind:s
+ogc            |TABLE   |INDEX
 ;
 
 // DESCRIBE
diff --git a/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_table_types.sql b/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_table_types.sql
@@ -1,7 +1,7 @@
 CREATE TABLE mock (
   TABLE_TYPE VARCHAR,
 ) AS
-SELECT 'BASE TABLE' FROM DUAL
+SELECT 'TABLE' FROM DUAL
 UNION ALL
 SELECT 'VIEW' FROM DUAL
 ;
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 null, 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test1', 'TABLE', '', null, null, null, null, null FROM DUAL
 UNION ALL
-SELECT null, 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test2', 'TABLE', '', null, null, null, null, null FROM DUAL
 ;
diff --git a/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_tables_empty.sql b/x-pack/plugin/sql/qa/src/main/resources/setup_mock_metadata_get_tables_empty.sql
@@ -9,7 +9,7 @@ CREATE TABLE mock (
   SELF_REFERENCING_COL_NAME VARCHAR,
   REF_GENERATION VARCHAR
 ) AS
-SELECT null, 'test_empty', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test_empty', 'TABLE', '', null, null, null, null, null FROM DUAL
 UNION ALL
-SELECT null, 'test_empty_again', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test_empty_again', '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 null, 'test1', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test1', 'TABLE', '', null, null, null, null, null FROM DUAL
 UNION ALL
-SELECT null, 'test2', 'BASE TABLE', '', null, null, null, null, null FROM DUAL
+SELECT null, 'test2', 'TABLE', '', null, null, null, null, null FROM DUAL
 ;
diff --git a/x-pack/plugin/sql/qa/src/main/resources/slow/frozen.csv-spec b/x-pack/plugin/sql/qa/src/main/resources/slow/frozen.csv-spec
@@ -7,13 +7,13 @@
 showTables
 SHOW TABLES INCLUDE FROZEN;
 
-       name        |     type   |  kind   
-frozen_emp         |BASE TABLE  |FROZEN INDEX
-logs               |BASE TABLE  |INDEX
-test_alias         |VIEW        |ALIAS
-test_alias_emp     |VIEW        |ALIAS 
-test_emp           |BASE TABLE  |INDEX  
-test_emp_copy      |BASE TABLE  |INDEX  
+       name        | type  |  kind   
+frozen_emp         |TABLE  |FROZEN INDEX
+logs               |TABLE  |INDEX
+test_alias         |VIEW   |ALIAS
+test_alias_emp     |VIEW   |ALIAS 
+test_emp           |TABLE  |INDEX  
+test_emp_copy      |TABLE  |INDEX  
 ;
 
 columnFromFrozen
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/CommandBuilder.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/parser/CommandBuilder.java
@@ -7,7 +7,9 @@
 
 import org.antlr.v4.runtime.Token;
 import org.elasticsearch.common.Booleans;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.xpack.ql.expression.Literal;
+import org.elasticsearch.xpack.ql.index.IndexResolver;
 import org.elasticsearch.xpack.ql.index.IndexResolver.IndexType;
 import org.elasticsearch.xpack.ql.plan.TableIdentifier;
 import org.elasticsearch.xpack.ql.tree.Source;
@@ -143,27 +145,19 @@ public Object visitShowColumns(ShowColumnsContext ctx) {
     @Override
     public SysTables visitSysTables(SysTablesContext ctx) {
         List<IndexType> types = new ArrayList<>();
-        boolean legacyTableType = false;
         for (StringContext string : ctx.string()) {
             String value = string(string);
-            if (value != null && value.isEmpty() == false) {
+            if (Strings.isEmpty(value) == false) {
                 // check special ODBC wildcard case
                 if (value.equals(StringUtils.SQL_WILDCARD) && ctx.string().size() == 1) {
                     // treat % as null
                     // https://docs.microsoft.com/en-us/sql/odbc/reference/develop-app/value-list-arguments
-                }
-                // special case for legacy apps (like msquery) that always asks for 'TABLE'
-                // which we manually map to all concrete tables supported
-                else {
+                } else {
                     switch (value.toUpperCase(Locale.ROOT)) {
-                        case IndexType.SQL_TABLE:
-                            legacyTableType = true;
-                            types.add(IndexType.STANDARD_INDEX);
-                            break;
-                        case IndexType.SQL_BASE_TABLE:
+                        case IndexResolver.SQL_TABLE:
                             types.add(IndexType.STANDARD_INDEX);
                             break;
-                        case IndexType.SQL_VIEW:
+                        case IndexResolver.SQL_VIEW:
                             types.add(IndexType.ALIAS);
                             break;
                         default:
@@ -177,7 +171,7 @@ public SysTables visitSysTables(SysTablesContext ctx) {
         EnumSet<IndexType> set = types.isEmpty() ? null : EnumSet.copyOf(types);
         TableIdentifier ti = visitTableIdentifier(ctx.tableIdent);
         String index = ti != null ? ti.qualifiedIndex() : null;
-        return new SysTables(source(ctx), visitLikePattern(ctx.clusterLike), index, visitLikePattern(ctx.tableLike), set, legacyTableType);
+        return new SysTables(source(ctx), visitLikePattern(ctx.clusterLike), index, visitLikePattern(ctx.tableLike), set);
     }
 
     @Override
@@ -198,4 +192,4 @@ public SysTypes visitSysTypes(SysTypesContext ctx) {
 
         return new SysTypes(source(ctx), Integer.valueOf(type));
     }
-}
+}
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTables.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTables.java
diff --git a/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTablesTests.java b/x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/plan/logical/command/sys/SysTablesTests.java

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void expectShowTables(List<String> tables, String user) throws Exception`
`133`	`133`	`for (String table : tables) {`
`134`	`134`	`List<String> fields = new ArrayList<>();`
`135`	`135`	`fields.add(table);`
`136`		`- fields.add("BASE TABLE");`
	`136`	`+ fields.add("TABLE");`
`137`	`137`	`fields.add("INDEX");`
`138`	`138`	`rows.add(fields);`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,11 +98,11 @@ public void testGetTypeOfTables() throws Exception {`
`98`	`98`
`99`	`99`	`CheckedSupplier<ResultSet, SQLException> all = () -> h2.createStatement()`
`100`	`100`	`.executeQuery("SELECT '" + clusterName() + "' AS TABLE_CAT, * FROM mock");`
`101`		`- assertResultSets(all.get(), es.getMetaData().getTables("%", "%", "%", new String[] { "BASE TABLE" }));`
	`101`	`+ assertResultSets(all.get(), es.getMetaData().getTables("%", "%", "%", new String[] { "TABLE" }));`
`102`	`102`	`assertResultSets(`
`103`	`103`	`h2.createStatement()`
`104`	`104`	`.executeQuery("SELECT '" + clusterName() + "' AS TABLE_CAT, * FROM mock WHERE TABLE_NAME = 'test1'"),`
`105`		`- es.getMetaData().getTables("%", "%", "test1", new String[] { "BASE TABLE" }));`
	`105`	`+ es.getMetaData().getTables("%", "%", "test1", new String[] { "TABLE" }));`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`showTables`
`8`	`8`	`SHOW TABLES "geo";`
`9`	`9`
`10`		`- name:s \| type:s \| kind:s`
`11`		`-geo \|BASE TABLE \|INDEX`
	`10`	`+ name:s \| type:s\| kind:s`
	`11`	`+geo \|TABLE \|INDEX`
`12`	`12`	`;`
`13`	`13`
`14`	`14`	`// DESCRIBE`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`showTables`
`8`	`8`	`SHOW TABLES "ogc";`
`9`	`9`
`10`		`- name:s \| type:s \| kind:s`
`11`		`-ogc \|BASE TABLE \|INDEX`
	`10`	`+ name:s \| type:s \| kind:s`
	`11`	`+ogc \|TABLE \|INDEX`
`12`	`12`	`;`
`13`	`13`
`14`	`14`	`// DESCRIBE`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`CREATE TABLE mock (`
`2`	`2`	`TABLE_TYPE VARCHAR,`
`3`	`3`	`) AS`
`4`		`-SELECT 'BASE TABLE' FROM DUAL`
	`4`	`+SELECT 'TABLE' FROM DUAL`
`5`	`5`	`UNION ALL`
`6`	`6`	`SELECT 'VIEW' FROM DUAL`
`7`	`7`	`;`