Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E62BE10336 for ; Tue, 8 Oct 2013 23:45:03 +0000 (UTC) Received: (qmail 87061 invoked by uid 500); 8 Oct 2013 23:45:03 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 87027 invoked by uid 500); 8 Oct 2013 23:45:03 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 87019 invoked by uid 99); 8 Oct 2013 23:45:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 23:45:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Oct 2013 23:45:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7C6A42388AA6; Tue, 8 Oct 2013 23:44:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1530466 - in /hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline: HiveSchemaHelper.java HiveSchemaTool.java Date: Tue, 08 Oct 2013 23:44:40 -0000 To: commits@hive.apache.org From: thejas@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131008234440.7C6A42388AA6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thejas Date: Tue Oct 8 23:44:40 2013 New Revision: 1530466 URL: http://svn.apache.org/r1530466 Log: HIVE-5449 : Hive schematool info option incorrectly reports error for Postgres metastore (Prasad Mujumdar via Thejas Nair) Modified: hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java Modified: hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java?rev=1530466&r1=1530465&r2=1530466&view=diff ============================================================================== --- hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java (original) +++ hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaHelper.java Tue Oct 8 23:44:40 2013 @@ -73,6 +73,12 @@ public class HiveSchemaHelper { * @return */ public String cleanseCommand(String dbCommand); + + /*** + * Does the DB required table/column names quoted + * @return + */ + public boolean needsQuotedIdentifier(); } @@ -115,6 +121,11 @@ public class HiveSchemaHelper { } return dbCommand; } + + @Override + public boolean needsQuotedIdentifier() { + return false; + } } @@ -215,6 +226,11 @@ public class HiveSchemaHelper { public boolean isNestedScript(String dbCommand) { return dbCommand.startsWith(POSTGRES_NESTING_TOKEN); } + + @Override + public boolean needsQuotedIdentifier() { + return true; + } } //Oracle specific parser Modified: hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java URL: http://svn.apache.org/viewvc/hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java?rev=1530466&r1=1530465&r2=1530466&view=diff ============================================================================== --- hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java (original) +++ hive/branches/branch-0.12/beeline/src/java/org/apache/hive/beeline/HiveSchemaTool.java Tue Oct 8 23:44:40 2013 @@ -116,7 +116,12 @@ public class HiveSchemaTool { // 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);