user name change

src/main/java/cn/edu/thu/tsfiledb/sql/parse/TSParser.g

@@ -449,47 +449,47 @@ createUser
     ;
 
 dropUser
-    : KW_DROP KW_USER userName=identifier
+    : KW_DROP KW_USER userName=Identifier
     -> ^(TOK_DROP ^(TOK_USER $userName))
     ;
 
 createRole
-    : KW_CREATE KW_ROLE roleName=identifier
+    : KW_CREATE KW_ROLE roleName=Identifier
     -> ^(TOK_CREATE ^(TOK_ROLE $roleName))
     ;
 
 dropRole
-    : KW_DROP KW_ROLE roleName=identifier
+    : KW_DROP KW_ROLE roleName=Identifier
     -> ^(TOK_DROP ^(TOK_ROLE $roleName))
     ;
 
 grantUser
-    : KW_GRANT KW_USER userName = identifier privileges KW_ON path
+    : KW_GRANT KW_USER userName = Identifier privileges KW_ON path
     -> ^(TOK_GRANT ^(TOK_USER $userName) privileges path)
     ;
 
 grantRole
-    : KW_GRANT KW_ROLE roleName=identifier privileges KW_ON path
+    : KW_GRANT KW_ROLE roleName=Identifier privileges KW_ON path
     -> ^(TOK_GRANT ^(TOK_ROLE $roleName) privileges path)
     ;
 
 revokeUser
-    : KW_REVOKE KW_USER userName = identifier privileges KW_ON path
+    : KW_REVOKE KW_USER userName = Identifier privileges KW_ON path
     -> ^(TOK_REVOKE ^(TOK_USER $userName) privileges path)
     ;
 
 revokeRole
-    : KW_REVOKE KW_ROLE roleName = identifier privileges KW_ON path
+    : KW_REVOKE KW_ROLE roleName = Identifier privileges KW_ON path
     -> ^(TOK_REVOKE ^(TOK_ROLE $roleName) privileges path)
     ;
 
 grantRoleToUser
-    : KW_GRANT roleName = identifier KW_TO userName = identifier
+    : KW_GRANT roleName = Identifier KW_TO userName = Identifier
     -> ^(TOK_GRANT ^(TOK_ROLE $roleName) ^(TOK_USER $userName))
     ;
 
 revokeRoleFromUser
-    : KW_REVOKE roleName = identifier KW_FROM userName = identifier
+    : KW_REVOKE roleName = Identifier KW_FROM userName = Identifier
     -> ^(TOK_REVOKE ^(TOK_ROLE $roleName) ^(TOK_USER $userName))
     ;
 
@@ -519,8 +519,8 @@ Assit to multi insert, target grammar:  insert into root.<deviceType>.<deviceNam
 
 multidentifier
 	:
-	LPAREN KW_TIMESTAMP (COMMA identifier)* RPAREN
-	-> ^(TOK_MULT_IDENTIFIER TOK_TIME identifier*)
+	LPAREN KW_TIMESTAMP (COMMA Identifier)* RPAREN
+	-> ^(TOK_MULT_IDENTIFIER TOK_TIME Identifier*)
 	;
 multiValue
 	:
@@ -538,7 +538,7 @@ deleteStatement
 updateStatement
    : KW_UPDATE path (COMMA path)* KW_SET KW_VALUE EQUAL value=numberOrStringWidely (whereClause)?
    -> ^(TOK_UPDATE path+ ^(TOK_VALUE $value) whereClause?)
-   | KW_UPDATE KW_USER userName=StringLiteral KW_SET KW_PASSWORD psw=StringLiteral
+   | KW_UPDATE KW_USER userName=Identifier KW_SET KW_PASSWORD psw=numberOrString
    -> ^(TOK_UPDATE ^(TOK_UPDATE_PSWD $userName $psw))
    ;
 

src/test/java/cn/edu/thu/tsfiledb/sql/SQLParserTest.java

@@ -507,9 +507,9 @@ public class SQLParserTest {
     @Test
     public void updatePassword() throws ParseException {
         // template for test case
-        ArrayList<String> ans = new ArrayList<>(Arrays.asList("TOK_UPDATE", "TOK_UPDATE_PSWD", "'myname'", "'newpassword'"));
+        ArrayList<String> ans = new ArrayList<>(Arrays.asList("TOK_UPDATE", "TOK_UPDATE_PSWD", "myname", "newpassword"));
         ArrayList<String> rec = new ArrayList<>();
-        ASTNode astTree = ParseGenerator.generateAST("update user 'myname' set password 'newpassword'");
+        ASTNode astTree = ParseGenerator.generateAST("update user myname set password newpassword");
         astTree = ParseUtils.findRootNonNullToken(astTree);
         recursivePrintSon(astTree, rec);