diff --git jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java index 35c8e8f..b108c7a 100644 --- jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java +++ jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java @@ -637,6 +637,14 @@ public void testMetaDataGetTables() throws SQLException { for (String checkPattern: tests.keySet()) { ResultSet rs = (ResultSet)con.getMetaData().getTables("default", null, checkPattern, null); + ResultSetMetaData resMeta = rs.getMetaData(); + assertEquals(5, resMeta.getColumnCount()); + assertEquals("TABLE_CAT", resMeta.getColumnName(1)); + assertEquals("TABLE_SCHEM", resMeta.getColumnName(2)); + assertEquals("TABLE_NAME", resMeta.getColumnName(3)); + assertEquals("TABLE_TYPE", resMeta.getColumnName(4)); + assertEquals("REMARKS", resMeta.getColumnName(5)); + int cnt = 0; while (rs.next()) { String resultTableName = rs.getString("TABLE_NAME"); @@ -678,7 +686,7 @@ public void testMetaDataGetSchemas() throws SQLException { ResultSet rs = (ResultSet)con.getMetaData().getSchemas(); ResultSetMetaData resMeta = rs.getMetaData(); assertEquals(2, resMeta.getColumnCount()); - assertEquals("TABLE_SCHEMA", resMeta.getColumnName(1)); + assertEquals("TABLE_SCHEM", resMeta.getColumnName(1)); assertEquals("TABLE_CATALOG", resMeta.getColumnName(2)); assertTrue(rs.next()); diff --git service/src/java/org/apache/hive/service/cli/operation/GetSchemasOperation.java service/src/java/org/apache/hive/service/cli/operation/GetSchemasOperation.java index 6970f35..bafe40c 100644 --- service/src/java/org/apache/hive/service/cli/operation/GetSchemasOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/GetSchemasOperation.java @@ -36,7 +36,7 @@ private final String schemaName; private static final TableSchema RESULT_SET_SCHEMA = new TableSchema() - .addStringColumn("TABLE_SCHEMA", "Schema name.") + .addStringColumn("TABLE_SCHEM", "Schema name.") .addStringColumn("TABLE_CATALOG", "Catalog name."); private RowSet rowSet; diff --git service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java index df8b5b3..d9d0e9c 100644 --- service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/GetTablesOperation.java @@ -46,7 +46,7 @@ private static final TableSchema RESULT_SET_SCHEMA = new TableSchema() .addStringColumn("TABLE_CAT", "Catalog name. NULL if not applicable.") - .addStringColumn("TABLE_SCHEMA", "Schema name.") + .addStringColumn("TABLE_SCHEM", "Schema name.") .addStringColumn("TABLE_NAME", "Table name.") .addStringColumn("TABLE_TYPE", "The table type, e.g. \"TABLE\", \"VIEW\", etc.") .addStringColumn("REMARKS", "Comments about the table.");