You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2018/11/13 22:32:41 UTC
[GitHub] fjy closed pull request #6595: SQL: Set INFORMATION_SCHEMA catalog
name to "druid".
fjy closed pull request #6595: SQL: Set INFORMATION_SCHEMA catalog name to "druid".
URL: https://github.com/apache/incubator-druid/pull/6595
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
index b8bb9f4e1e7..d79b23a2619 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/schema/InformationSchema.java
@@ -63,7 +63,7 @@
{
public static final String NAME = "INFORMATION_SCHEMA";
- private static final String EMPTY_CATALOG = "";
+ private static final String CATALOG_NAME = "druid";
private static final String SCHEMATA_TABLE = "SCHEMATA";
private static final String TABLES_TABLE = "TABLES";
private static final String COLUMNS_TABLE = "COLUMNS";
@@ -149,7 +149,7 @@ public InformationSchema(
{
final SchemaPlus subSchema = rootSchema.getSubSchema(schemaName);
return new Object[]{
- EMPTY_CATALOG, // CATALOG_NAME
+ CATALOG_NAME, // CATALOG_NAME
subSchema.getName(), // SCHEMA_NAME
null, // SCHEMA_OWNER
null, // DEFAULT_CHARACTER_SET_CATALOG
@@ -220,7 +220,7 @@ public TableType getJdbcTableType()
public Object[] apply(final String tableName)
{
return new Object[]{
- EMPTY_CATALOG, // TABLE_CATALOG
+ CATALOG_NAME, // TABLE_CATALOG
schemaName, // TABLE_SCHEMA
tableName, // TABLE_NAME
subSchema.getTable(tableName).getJdbcTableType().toString() // TABLE_TYPE
@@ -236,7 +236,7 @@ public TableType getJdbcTableType()
{
if (getView(subSchema, functionName) != null) {
return new Object[]{
- EMPTY_CATALOG, // TABLE_CATALOG
+ CATALOG_NAME, // TABLE_CATALOG
schemaName, // TABLE_SCHEMA
functionName, // TABLE_NAME
"VIEW" // TABLE_TYPE
@@ -397,7 +397,7 @@ public TableType getJdbcTableType()
boolean isCharacter = SqlTypeName.CHAR_TYPES.contains(type.getSqlTypeName());
boolean isDateTime = SqlTypeName.DATETIME_TYPES.contains(type.getSqlTypeName());
return new Object[]{
- EMPTY_CATALOG, // TABLE_CATALOG
+ CATALOG_NAME, // TABLE_CATALOG
schemaName, // TABLE_SCHEMA
tableName, // TABLE_NAME
field.getName(), // COLUMN_NAME
diff --git a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
index 1b92d0db142..0d82a2f061a 100644
--- a/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/avatica/DruidAvaticaHandlerTest.java
@@ -346,7 +346,7 @@ public void testDatabaseMetaDataCatalogs() throws Exception
final DatabaseMetaData metaData = client.getMetaData();
Assert.assertEquals(
ImmutableList.of(
- ROW(Pair.of("TABLE_CAT", ""))
+ ROW(Pair.of("TABLE_CAT", "druid"))
),
getRows(metaData.getCatalogs())
);
@@ -358,7 +358,7 @@ public void testDatabaseMetaDataSchemas() throws Exception
final DatabaseMetaData metaData = client.getMetaData();
Assert.assertEquals(
ImmutableList.of(
- ROW(Pair.of("TABLE_CATALOG", ""), Pair.of("TABLE_SCHEM", "druid"))
+ ROW(Pair.of("TABLE_CATALOG", "druid"), Pair.of("TABLE_SCHEM", "druid"))
),
getRows(metaData.getSchemas(null, "druid"))
);
@@ -371,13 +371,13 @@ public void testDatabaseMetaDataTables() throws Exception
Assert.assertEquals(
ImmutableList.of(
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", "foo"),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
),
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", "foo2"),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
@@ -397,19 +397,19 @@ public void testDatabaseMetaDataTablesAsSuperuser() throws Exception
Assert.assertEquals(
ImmutableList.of(
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", CalciteTests.DATASOURCE1),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
),
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", CalciteTests.DATASOURCE2),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
),
ROW(
- Pair.of("TABLE_CAT", ""),
+ Pair.of("TABLE_CAT", "druid"),
Pair.of("TABLE_NAME", CalciteTests.FORBIDDEN_DATASOURCE),
Pair.of("TABLE_SCHEM", "druid"),
Pair.of("TABLE_TYPE", "TABLE")
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org