Index: src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java =================================================================== --- src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java (revision 1097179) +++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateDatabaseHook.java (working copy) @@ -49,7 +49,7 @@ // Analyze and create tbl properties object int numCh = ast.getChildCount(); - databaseName = BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText()); + databaseName = BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0)); for (int num = 1; num < numCh; num++) { ASTNode child = (ASTNode) ast.getChild(num); Index: src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java =================================================================== --- src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java (revision 1097179) +++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/HCatSemanticAnalyzer.java (working copy) @@ -111,7 +111,7 @@ break; case HiveParser.TOK_SHOWPARTITIONS: - authorize(BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText()), context, FsAction.READ, false); + authorize(BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0)), context, FsAction.READ, false); break; case HiveParser.TOK_ALTERTABLE_ADDPARTS: @@ -122,7 +122,7 @@ case HiveParser.TOK_ALTERTABLE_PROPERTIES: case HiveParser.TOK_ALTERTABLE_SERIALIZER: case HiveParser.TOK_ALTERTABLE_SERDEPROPERTIES: - authorize(BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText()), context, FsAction.WRITE, false); + authorize(BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0)), context, FsAction.WRITE, false); break; case HiveParser.TOK_ALTERTABLE_PARTITION: @@ -130,11 +130,11 @@ break; case HiveParser.TOK_SWITCHDATABASE: - authorize(BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText()), context, FsAction.READ, true); + authorize(BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0)), context, FsAction.READ, true); break; case HiveParser.TOK_DROPDATABASE: - authorize(BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText()), context, FsAction.WRITE, true); + authorize(BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0)), context, FsAction.WRITE, true); break; case HiveParser.TOK_CREATEDATABASE: Index: src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java =================================================================== --- src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java (revision 1097179) +++ src/java/org/apache/hcatalog/cli/SemanticAnalysis/CreateTableHook.java (working copy) @@ -66,7 +66,7 @@ int numCh = ast.getChildCount(); String inputFormat = null, outputFormat = null; - tableName = BaseSemanticAnalyzer.unescapeIdentifier(ast.getChild(0).getText()); + tableName = BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0)); for (int num = 1; num < numCh; num++) { ASTNode child = (ASTNode) ast.getChild(num); @@ -90,7 +90,7 @@ case HiveParser.TOK_LIKETABLE: String likeTableName; - if (child.getChildCount() > 0 && (likeTableName = BaseSemanticAnalyzer.unescapeIdentifier(child.getChild(0).getText())) != null) { + if (child.getChildCount() > 0 && (likeTableName = BaseSemanticAnalyzer.getUnescapedName((ASTNode)ast.getChild(0))) != null) { throw new SemanticException("Operation not supported. CREATE TABLE LIKE is not supported."); // Map tblProps; Property changes on: hive ___________________________________________________________________ Modified: svn:externals - -r 1071529 http://svn.apache.org/repos/asf/hive/branches/branch-0.7/ external + -r 1085590 http://svn.apache.org/repos/asf//hive/tags/release-0.7.0 external