[CALCITE-789] MetaImpl.MetaCatalog should expose TABLE_CAT instead of…

… TABLE_CATALOG
julianhyde · Jul 7, 2015 · d44ff78 · d44ff78
1 parent 03111d2
commit d44ff78
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/avatica/src/main/java/org/apache/calcite/avatica/Meta.java b/avatica/src/main/java/org/apache/calcite/avatica/Meta.java
@@ -52,98 +52,124 @@ public interface Meta {
    */
   Map<DatabaseProperty, Object> getDatabaseProperties();
 
+  /** Per {@link DatabaseMetaData#getTables(String, String, String, String[])}. */
   MetaResultSet getTables(String catalog,
       Pat schemaPattern,
       Pat tableNamePattern,
       List<String> typeList);
 
+  /** Per {@link DatabaseMetaData#getColumns(String, String, String, String)}. */
   MetaResultSet getColumns(String catalog,
       Pat schemaPattern,
       Pat tableNamePattern,
       Pat columnNamePattern);
 
   MetaResultSet getSchemas(String catalog, Pat schemaPattern);
 
+  /** Per {@link DatabaseMetaData#getCatalogs()}. */
   MetaResultSet getCatalogs();
 
+  /** Per {@link DatabaseMetaData#getTableTypes()}. */
   MetaResultSet getTableTypes();
 
+  /** Per {@link DatabaseMetaData#getProcedures(String, String, String)}. */
   MetaResultSet getProcedures(String catalog,
       Pat schemaPattern,
       Pat procedureNamePattern);
 
+  /** Per {@link DatabaseMetaData#getProcedureColumns(String, String, String, String)}. */
   MetaResultSet getProcedureColumns(String catalog,
       Pat schemaPattern,
       Pat procedureNamePattern,
       Pat columnNamePattern);
 
+  /** Per {@link DatabaseMetaData#getColumnPrivileges(String, String, String, String)}. */
   MetaResultSet getColumnPrivileges(String catalog,
       String schema,
       String table,
       Pat columnNamePattern);
 
+  /** Per {@link DatabaseMetaData#getTablePrivileges(String, String, String)}. */
   MetaResultSet getTablePrivileges(String catalog,
       Pat schemaPattern,
       Pat tableNamePattern);
 
+  /** Per
+   * {@link DatabaseMetaData#getBestRowIdentifier(String, String, String, int, boolean)}. */
   MetaResultSet getBestRowIdentifier(String catalog,
       String schema,
       String table,
       int scope,
       boolean nullable);
 
+  /** Per {@link DatabaseMetaData#getVersionColumns(String, String, String)}. */
   MetaResultSet getVersionColumns(String catalog, String schema, String table);
 
+  /** Per {@link DatabaseMetaData#getPrimaryKeys(String, String, String)}. */
   MetaResultSet getPrimaryKeys(String catalog, String schema, String table);
 
+  /** Per {@link DatabaseMetaData#getImportedKeys(String, String, String)}. */
   MetaResultSet getImportedKeys(String catalog, String schema, String table);
 
+  /** Per {@link DatabaseMetaData#getExportedKeys(String, String, String)}. */
   MetaResultSet getExportedKeys(String catalog, String schema, String table);
 
+  /** Per
+   * {@link DatabaseMetaData#getCrossReference(String, String, String, String, String, String)}. */
   MetaResultSet getCrossReference(String parentCatalog,
       String parentSchema,
       String parentTable,
       String foreignCatalog,
       String foreignSchema,
       String foreignTable);
 
+  /** Per {@link DatabaseMetaData#getTypeInfo()}. */
   MetaResultSet getTypeInfo();
 
+  /** Per {@link DatabaseMetaData#getIndexInfo(String, String, String, boolean, boolean)}. */
   MetaResultSet getIndexInfo(String catalog,
       String schema,
       String table,
       boolean unique,
       boolean approximate);
 
+  /** Per {@link DatabaseMetaData#getUDTs(String, String, String, int[])}. */
   MetaResultSet getUDTs(String catalog,
       Pat schemaPattern,
       Pat typeNamePattern,
       int[] types);
 
+  /** Per {@link DatabaseMetaData#getSuperTypes(String, String, String)}. */
   MetaResultSet getSuperTypes(String catalog,
       Pat schemaPattern,
       Pat typeNamePattern);
 
+  /** Per {@link DatabaseMetaData#getSuperTables(String, String, String)}. */
   MetaResultSet getSuperTables(String catalog,
       Pat schemaPattern,
       Pat tableNamePattern);
 
+  /** Per {@link DatabaseMetaData#getAttributes(String, String, String, String)}. */
   MetaResultSet getAttributes(String catalog,
       Pat schemaPattern,
       Pat typeNamePattern,
       Pat attributeNamePattern);
 
+  /** Per {@link DatabaseMetaData#getClientInfoProperties()}. */
   MetaResultSet getClientInfoProperties();
 
+  /** Per {@link DatabaseMetaData#getFunctions(String, String, String)}. */
   MetaResultSet getFunctions(String catalog,
       Pat schemaPattern,
       Pat functionNamePattern);
 
+  /** Per {@link DatabaseMetaData#getFunctionColumns(String, String, String, String)}. */
   MetaResultSet getFunctionColumns(String catalog,
       Pat schemaPattern,
       Pat functionNamePattern,
       Pat columnNamePattern);
 
+  /** Per {@link DatabaseMetaData#getPseudoColumns(String, String, String, String)}. */
   MetaResultSet getPseudoColumns(String catalog,
       Pat schemaPattern,
       Pat tableNamePattern,

diff --git a/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java b/avatica/src/main/java/org/apache/calcite/avatica/MetaImpl.java
@@ -374,15 +374,15 @@ public String getName() {
 
   /** Metadata describing a catalog. */
   public static class MetaCatalog implements Named {
-    public final String tableCatalog;
+    public final String tableCat;
 
     public MetaCatalog(
         String tableCatalog) {
-      this.tableCatalog = tableCatalog;
+      this.tableCat = tableCatalog;
     }
 
     public String getName() {
-      return tableCatalog;
+      return tableCat;
     }
   }
 

diff --git a/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java b/core/src/main/java/org/apache/calcite/jdbc/CalciteMetaImpl.java
@@ -514,7 +514,7 @@ public MetaResultSet getSchemas(String catalog, Pat schemaPattern) {
   public MetaResultSet getCatalogs() {
     return createResultSet(catalogs(),
         MetaCatalog.class,
-        "TABLE_CATALOG");
+        "TABLE_CAT");
   }
 
   public MetaResultSet getTableTypes() {

diff --git a/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java b/core/src/test/java/org/apache/calcite/jdbc/CalciteRemoteDriverTest.java
@@ -174,7 +174,7 @@ public ResultSet apply(Connection input) {
     final ResultSet resultSet = connection.getMetaData().getCatalogs();
     final ResultSetMetaData metaData = resultSet.getMetaData();
     assertEquals(1, metaData.getColumnCount());
-    assertEquals("TABLE_CATALOG", metaData.getColumnName(1));
+    assertEquals("TABLE_CAT", metaData.getColumnName(1));
     assertTrue(resultSet.next());
     assertFalse(resultSet.next());
     resultSet.close();
@@ -241,7 +241,7 @@ public ResultSet apply(Connection input) {
   @Test public void testRemoteCatalogs() throws Exception {
     CalciteAssert.hr().with(REMOTE_CONNECTION_FACTORY)
         .metaData(GET_CATALOGS)
-        .returns("TABLE_CATALOG=null\n");
+        .returns("TABLE_CAT=null\n");
   }
 
   @Test public void testRemoteSchemas() throws Exception {

diff --git a/core/src/test/java/org/apache/calcite/test/JdbcTest.java b/core/src/test/java/org/apache/calcite/test/JdbcTest.java
@@ -5084,7 +5084,7 @@ public Void apply(CalciteConnection a0) {
 
               // catalog
               assertEquals(
-                  "TABLE_CATALOG=null\n",
+                  "TABLE_CAT=null\n",
                   CalciteAssert.toString(
                       metaData.getCatalogs()));