diff --git beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java index 23e2fc7..5dda36c 100644 --- beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java +++ beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java @@ -73,6 +73,12 @@ * @return */ public String cleanseCommand(String dbCommand); + + /*** + * Does the DB required table/column names quoted + * @return + */ + public boolean needsQuotedIdentifier(); } @@ -115,6 +121,11 @@ public String cleanseCommand(String dbCommand) { } return dbCommand; } + + @Override + public boolean needsQuotedIdentifier() { + return false; + } } @@ -215,6 +226,11 @@ public String getScriptName(String dbCommand) throws IllegalArgumentException { public boolean isNestedScript(String dbCommand) { return dbCommand.startsWith(POSTGRES_NESTING_TOKEN); } + + @Override + public boolean needsQuotedIdentifier() { + return true; + } } //Oracle specific parser diff --git beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java index a1f9a6a..1b8e315 100644 --- beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java +++ beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java @@ -116,7 +116,12 @@ public void showInfo() throws HiveMetaException { // read schema version from metastore private String getMetaStoreSchemaVersion(Connection metastoreConn) throws HiveMetaException { - String versionQuery = "select t.SCHEMA_VERSION from VERSION t"; + String versionQuery; + if (HiveSchemaHelper.getDbCommandParser(dbType).needsQuotedIdentifier()) { + versionQuery = "select t.\"SCHEMA_VERSION\" from \"VERSION\" t"; + } else { + versionQuery = "select t.SCHEMA_VERSION from VERSION t"; + } try { Statement stmt = metastoreConn.createStatement(); ResultSet res = stmt.executeQuery(versionQuery);