diff --git eclipse-templates/.classpath eclipse-templates/.classpath index f5c580b..5cd074c 100644 --- eclipse-templates/.classpath +++ eclipse-templates/.classpath @@ -46,6 +46,7 @@ + @@ -57,7 +58,6 @@ - @@ -88,11 +88,13 @@ + + diff --git jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java index 2e26ce0..2e5c30e 100644 --- jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java +++ jdbc/src/test/org/apache/hive/jdbc/TestJdbcDriver2.java @@ -811,17 +811,19 @@ public void testDescribeTable() throws SQLException { ResultSet res = stmt.executeQuery("describe " + tableName); + res.next(); // skip header 1 + res.next(); // skip header 2 + res.next(); - assertEquals("Column name 'under_col' not found", "under_col", res.getString(1)); + assertEquals("Column name 'under_col' not found", "under_col", res.getString(1).trim()); assertEquals("Column type 'under_col' for column under_col not found", "int", res - .getString(2)); + .getString(2).trim()); res.next(); - assertEquals("Column name 'value' not found", "value", res.getString(1)); + assertEquals("Column name 'value' not found", "value", res.getString(1).trim()); assertEquals("Column type 'string' for column key not found", "string", res - .getString(2)); + .getString(2).trim()); assertFalse("More results found than expected", res.next()); - } public void testDatabaseMetaData() throws SQLException {