diff --git a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java
index ee74a8ec4e..e0c6d668ee 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/hive/parser/HiveLexer.java
@@ -9,92 +9,27 @@ import com.alibaba.druid.sql.parser.NotAllowCommentException;
 import com.alibaba.druid.sql.parser.Token;
 
 public class HiveLexer extends Lexer {
-    public final static Keywords DEFAULT_SQL_SERVER_KEYWORDS;
+
+    public final static Keywords DEFAULT_HIVE_KEYWORDS;
 
     static {
         Map<String, Token> map = new HashMap<String, Token>();
-        map.put("EXISTS", Token.EXISTS);
-        map.put("THEN", Token.THEN);
-        map.put("AS", Token.AS);
-        map.put("GROUP", Token.GROUP);
-        map.put("BY", Token.BY);
-        map.put("HAVING", Token.HAVING);
-        map.put("DELETE", Token.DELETE);
-        map.put("ORDER", Token.ORDER);
-        map.put("INDEX", Token.INDEX);
-        map.put("FOR", Token.FOR);
-        map.put("SCHEMA", Token.SCHEMA);
-        map.put("FOREIGN", Token.FOREIGN);
-        map.put("REFERENCES", Token.REFERENCES);
-        map.put("CHECK", Token.CHECK);
-        map.put("PRIMARY", Token.PRIMARY);
-        map.put("KEY", Token.KEY);
-        map.put("CONSTRAINT", Token.CONSTRAINT);
-        map.put("DEFAULT", Token.DEFAULT);
-        map.put("VIEW", Token.VIEW);
-        map.put("CREATE", Token.CREATE);
-        map.put("VALUES", Token.VALUES);
-        map.put("ALTER", Token.ALTER);
-        map.put("TABLE", Token.TABLE);
-        map.put("DROP", Token.DROP);
-        map.put("SET", Token.SET);
-        map.put("INTO", Token.INTO);
-        map.put("UPDATE", Token.UPDATE);
-        map.put("NULL", Token.NULL);
-        map.put("IS", Token.IS);
-        map.put("NOT", Token.NOT);
-        map.put("SELECT", Token.SELECT);
-        map.put("INSERT", Token.INSERT);
-        map.put("FROM", Token.FROM);
-        map.put("WHERE", Token.WHERE);
-        map.put("AND", Token.AND);
-        map.put("OR", Token.OR);
-        map.put("XOR", Token.XOR);
-        map.put("DISTINCT", Token.DISTINCT);
-        map.put("UNIQUE", Token.UNIQUE);
-        map.put("ALL", Token.ALL);
-        map.put("UNION", Token.UNION);
-        map.put("INTERSECT", Token.INTERSECT);
-        map.put("MINUS", Token.MINUS);
-        map.put("INNER", Token.INNER);
-        map.put("LEFT", Token.LEFT);
-        map.put("RIGHT", Token.RIGHT);
-        map.put("FULL", Token.FULL);
-        map.put("ON", Token.ON);
-        map.put("OUTER", Token.OUTER);
-        map.put("JOIN", Token.JOIN);
-        map.put("NEW", Token.NEW);
-        map.put("CASE", Token.CASE);
-        map.put("WHEN", Token.WHEN);
-        map.put("END", Token.END);
-        map.put("WHEN", Token.WHEN);
-        map.put("ELSE", Token.ELSE);
-        map.put("EXISTS", Token.EXISTS);
-        map.put("CAST", Token.CAST);
-        map.put("IN", Token.IN);
-        map.put("ASC", Token.ASC);
-        map.put("DESC", Token.DESC);
-        map.put("LIKE", Token.LIKE);
-        map.put("ESCAPE", Token.ESCAPE);
-        map.put("BETWEEN", Token.BETWEEN);
-        map.put("INTERVAL", Token.INTERVAL);
-        map.put("LOCK", Token.LOCK);
-        map.put("SOME", Token.SOME);
-        map.put("ANY", Token.ANY);
+
+        map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
 
         map.put("WITH", Token.WITH);
 
-        DEFAULT_SQL_SERVER_KEYWORDS = new Keywords(map);
-    }
-    
-    public HiveLexer(char[] input, int inputLength, boolean skipComment){
-        super(input, inputLength, skipComment);
-        super.keywods = DEFAULT_SQL_SERVER_KEYWORDS;
+        DEFAULT_HIVE_KEYWORDS = new Keywords(map);
     }
 
-    public HiveLexer(String input) {
+    public HiveLexer(char[] input, int inputLength, boolean skipComment){
+        super(input, inputLength, skipComment);
+        super.keywods = DEFAULT_HIVE_KEYWORDS;
+    }
+
+    public HiveLexer(String input){
         super(input);
-        super.keywods = DEFAULT_SQL_SERVER_KEYWORDS;
+        super.keywods = DEFAULT_HIVE_KEYWORDS;
     }
 
     public void scanComment() {
@@ -144,14 +79,14 @@ public class HiveLexer extends Lexer {
                 stringVal = new String(buf, np, sp);
                 token = Token.MULTI_LINE_COMMENT;
             }
-            
+
             if (token != Token.HINT && !isAllowComment()) {
                 throw new NotAllowCommentException();
             }
 
             return;
         }
-        
+
         if (!isAllowComment()) {
             throw new NotAllowCommentException();
         }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
index dbaf6592ec..8a033879b6 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
@@ -801,7 +801,7 @@ public class MySqlStatementParser extends SQLStatementParser {
         if (lexer.token() == Token.CREATE) {
             lexer.nextToken();
 
-            if (identifierEquals("DATABASE")) {
+            if (lexer.token() == Token.DATABASE) {
                 lexer.nextToken();
 
                 MySqlShowCreateDatabaseStatement stmt = new MySqlShowCreateDatabaseStatement();
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java
index 292686f47a..658a20a017 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/parser/OracleLexer.java
@@ -19,116 +19,53 @@ public class OracleLexer extends Lexer {
 
     static {
         Map<String, Token> map = new HashMap<String, Token>();
-        map.put("EXISTS", Token.EXISTS);
-        map.put("THEN", Token.THEN);
-        map.put("AS", Token.AS);
-        map.put("GROUP", Token.GROUP);
-        map.put("BY", Token.BY);
-        map.put("HAVING", Token.HAVING);
-        map.put("DELETE", Token.DELETE);
-        map.put("ORDER", Token.ORDER);
-        map.put("INDEX", Token.INDEX);
-        map.put("FOR", Token.FOR);
-        map.put("SCHEMA", Token.SCHEMA);
-        map.put("FOREIGN", Token.FOREIGN);
-        map.put("REFERENCES", Token.REFERENCES);
-        map.put("CHECK", Token.CHECK);
-        map.put("PRIMARY", Token.PRIMARY);
-        map.put("KEY", Token.KEY);
-        map.put("CONSTRAINT", Token.CONSTRAINT);
-        map.put("DEFAULT", Token.DEFAULT);
-        map.put("VIEW", Token.VIEW);
-        map.put("CREATE", Token.CREATE);
-        map.put("VALUES", Token.VALUES);
-        map.put("ALTER", Token.ALTER);
-        map.put("TABLE", Token.TABLE);
-        map.put("DROP", Token.DROP);
-        map.put("SET", Token.SET);
-        map.put("INTO", Token.INTO);
-        map.put("UPDATE", Token.UPDATE);
-        map.put("NULL", Token.NULL);
-        map.put("IS", Token.IS);
-        map.put("NOT", Token.NOT);
-        map.put("SELECT", Token.SELECT);
-        map.put("INSERT", Token.INSERT);
-        map.put("FROM", Token.FROM);
-        map.put("WHERE", Token.WHERE);
-        map.put("AND", Token.AND);
-        map.put("OR", Token.OR);
-        map.put("XOR", Token.XOR);
-        map.put("DISTINCT", Token.DISTINCT);
-        map.put("UNIQUE", Token.UNIQUE);
-        map.put("ALL", Token.ALL);
-        map.put("UNION", Token.UNION);
-        map.put("INTERSECT", Token.INTERSECT);
-        map.put("MINUS", Token.MINUS);
-        map.put("INNER", Token.INNER);
-        map.put("LEFT", Token.LEFT);
-        map.put("RIGHT", Token.RIGHT);
-        map.put("FULL", Token.FULL);
-        map.put("ON", Token.ON);
-        map.put("OUTER", Token.OUTER);
-        map.put("JOIN", Token.JOIN);
-        map.put("NEW", Token.NEW);
-        map.put("CASE", Token.CASE);
-        map.put("WHEN", Token.WHEN);
-        map.put("END", Token.END);
-        map.put("WHEN", Token.WHEN);
-        map.put("ELSE", Token.ELSE);
-        map.put("EXISTS", Token.EXISTS);
-        map.put("CAST", Token.CAST);
-        map.put("IN", Token.IN);
-        map.put("ASC", Token.ASC);
-        map.put("DESC", Token.DESC);
-        map.put("LIKE", Token.LIKE);
-        map.put("ESCAPE", Token.ESCAPE);
-        map.put("BETWEEN", Token.BETWEEN);
-        map.put("INTERVAL", Token.INTERVAL);
-        map.put("LOCK", Token.LOCK);
-        map.put("SOME", Token.SOME);
-        map.put("ANY", Token.ANY);
-        map.put("TRUNCATE", Token.TRUNCATE);
-
-        map.put("START", Token.START);
-        map.put("CONNECT", Token.CONNECT);
-        map.put("PRIOR", Token.PRIOR);
-        map.put("WITH", Token.WITH);
-        map.put("EXTRACT", Token.EXTRACT);
-        map.put("COLUMN", Token.COLUMN);
-
-        map.put("CURSOR", Token.CURSOR);
         
-        map.put("MODEL", Token.MODEL);
-        map.put("MERGE", Token.MERGE);
-        map.put("USING", Token.USING);
-        map.put("MATCHED", Token.MATCHED);
-        map.put("ERRORS", Token.ERRORS);
-        map.put("REJECT", Token.REJECT);
-        map.put("UNLIMITED", Token.UNLIMITED);
-        map.put("RETURNING", Token.RETURNING);
-        map.put("LIMIT", Token.LIMIT);
-        map.put("OF", Token.OF);
+        map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
+
         map.put("BEGIN", Token.BEGIN);
-        map.put("SHARE", Token.SHARE);
-        map.put("EXCLUSIVE", Token.EXCLUSIVE);
-        map.put("MODE", Token.MODE);
-        map.put("WAIT", Token.WAIT);
-        map.put("NOWAIT", Token.NOWAIT);
-        map.put("SESSION", Token.SESSION);
-        map.put("PROCEDURE", Token.PROCEDURE);
-        map.put("LOCAL", Token.LOCAL);
-        map.put("SYSDATE", Token.SYSDATE);
-        map.put("DECLARE", Token.DECLARE);
-        map.put("EXCEPTION", Token.EXCEPTION);
-        map.put("GRANT", Token.GRANT);
+        map.put("COLUMN", Token.COLUMN);
         map.put("COMMENT", Token.COMMENT);
-        map.put("LOOP", Token.LOOP);
-        map.put("IF", Token.IF);
-        map.put("ELSE", Token.ELSE);
-        map.put("GOTO", Token.GOTO);
         map.put("COMMIT", Token.COMMIT);
-        map.put("SAVEPOINT", Token.SAVEPOINT);
+        map.put("CONNECT", Token.CONNECT);
+
         map.put("CROSS", Token.CROSS);
+        map.put("CURSOR", Token.CURSOR);
+        map.put("DECLARE", Token.DECLARE);
+        map.put("ERRORS", Token.ERRORS);
+        map.put("EXCEPTION", Token.EXCEPTION);
+
+        map.put("EXCLUSIVE", Token.EXCLUSIVE);
+        map.put("EXTRACT", Token.EXTRACT);
+        map.put("GOTO", Token.GOTO);
+        map.put("GRANT", Token.GRANT);
+        map.put("IF", Token.IF);
+
+        map.put("LIMIT", Token.LIMIT);
+        map.put("LOCAL", Token.LOCAL);
+        map.put("LOOP", Token.LOOP);
+        map.put("MATCHED", Token.MATCHED);
+        map.put("MERGE", Token.MERGE);
+
+        map.put("MODE", Token.MODE);
+        map.put("MODEL", Token.MODEL);
+        map.put("NOWAIT", Token.NOWAIT);
+        map.put("OF", Token.OF);
+        map.put("PRIOR", Token.PRIOR);
+
+        map.put("PROCEDURE", Token.PROCEDURE);
+        map.put("REJECT", Token.REJECT);
+        map.put("RETURNING", Token.RETURNING);
+        map.put("SAVEPOINT", Token.SAVEPOINT);
+        map.put("SESSION", Token.SESSION);
+
+        map.put("SHARE", Token.SHARE);
+        map.put("START", Token.START);
+        map.put("SYSDATE", Token.SYSDATE);
+        map.put("UNLIMITED", Token.UNLIMITED);
+        map.put("USING", Token.USING);
+
+        map.put("WAIT", Token.WAIT);
+        map.put("WITH", Token.WITH);
 
         DEFAULT_ORACLE_KEYWORDS = new Keywords(map);
     }
@@ -245,14 +182,14 @@ public class OracleLexer extends Lexer {
                 stringVal = new String(buf, np, sp);
                 token = Token.MULTI_LINE_COMMENT;
             }
-            
+
             if (token != Token.HINT && !isAllowComment()) {
                 throw new NotAllowCommentException();
             }
 
             return;
         }
-        
+
         if (!isAllowComment()) {
             throw new NotAllowCommentException();
         }
@@ -367,5 +304,5 @@ public class OracleLexer extends Lexer {
             token = Token.LITERAL_INT;
         }
     }
-    
+
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
index a887161803..7cd1aad304 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGLexer.java
@@ -9,109 +9,46 @@ import com.alibaba.druid.sql.parser.Token;
 
 public class PGLexer extends Lexer {
 
-    public final static Keywords DEFAULT_MYSQL_KEYWORDS;
+    public final static Keywords DEFAULT_PG_KEYWORDS;
 
     static {
         Map<String, Token> map = new HashMap<String, Token>();
-        map.put("EXISTS", Token.EXISTS);
-        map.put("THEN", Token.THEN);
-        map.put("AS", Token.AS);
-        map.put("GROUP", Token.GROUP);
-        map.put("BY", Token.BY);
-        map.put("HAVING", Token.HAVING);
-        map.put("DELETE", Token.DELETE);
-        map.put("ORDER", Token.ORDER);
-        map.put("INDEX", Token.INDEX);
-        map.put("FOR", Token.FOR);
-        map.put("SCHEMA", Token.SCHEMA);
-        map.put("FOREIGN", Token.FOREIGN);
-        map.put("REFERENCES", Token.REFERENCES);
-        map.put("CHECK", Token.CHECK);
-        map.put("PRIMARY", Token.PRIMARY);
-        map.put("KEY", Token.KEY);
-        map.put("CONSTRAINT", Token.CONSTRAINT);
-        map.put("DEFAULT", Token.DEFAULT);
-        map.put("VIEW", Token.VIEW);
-        map.put("CREATE", Token.CREATE);
-        map.put("VALUES", Token.VALUES);
-        map.put("ALTER", Token.ALTER);
-        map.put("TABLE", Token.TABLE);
-        map.put("DROP", Token.DROP);
-        map.put("SET", Token.SET);
-        map.put("INTO", Token.INTO);
-        map.put("UPDATE", Token.UPDATE);
-        map.put("NULL", Token.NULL);
-        map.put("IS", Token.IS);
-        map.put("NOT", Token.NOT);
-        map.put("SELECT", Token.SELECT);
-        map.put("INSERT", Token.INSERT);
-        map.put("FROM", Token.FROM);
-        map.put("WHERE", Token.WHERE);
-        map.put("AND", Token.AND);
-        map.put("OR", Token.OR);
-        map.put("XOR", Token.XOR);
-        map.put("DISTINCT", Token.DISTINCT);
-        map.put("UNIQUE", Token.UNIQUE);
-        map.put("ALL", Token.ALL);
-        map.put("UNION", Token.UNION);
-        map.put("INTERSECT", Token.INTERSECT);
-        map.put("MINUS", Token.MINUS);
-        map.put("INNER", Token.INNER);
-        map.put("LEFT", Token.LEFT);
-        map.put("RIGHT", Token.RIGHT);
-        map.put("FULL", Token.FULL);
-        map.put("ON", Token.ON);
-        map.put("OUTER", Token.OUTER);
-        map.put("JOIN", Token.JOIN);
-        map.put("NEW", Token.NEW);
-        map.put("CASE", Token.CASE);
-        map.put("WHEN", Token.WHEN);
-        map.put("END", Token.END);
-        map.put("WHEN", Token.WHEN);
-        map.put("ELSE", Token.ELSE);
-        map.put("EXISTS", Token.EXISTS);
-        map.put("CAST", Token.CAST);
-        map.put("IN", Token.IN);
-        map.put("ASC", Token.ASC);
-        map.put("DESC", Token.DESC);
-        map.put("LIKE", Token.LIKE);
-        map.put("ESCAPE", Token.ESCAPE);
-        map.put("BETWEEN", Token.BETWEEN);
-        map.put("INTERVAL", Token.INTERVAL);
-        map.put("LOCK", Token.LOCK);
-        map.put("SOME", Token.SOME);
-        map.put("ANY", Token.ANY);
-        map.put("TRUNCATE", Token.TRUNCATE);
 
+        map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
+
+        map.put("CASCADE", Token.CASCADE);
+        map.put("CONTINUE", Token.CONTINUE);
+        map.put("CURRENT", Token.CURRENT);
+        map.put("FETCH", Token.FETCH);
+        map.put("FIRST", Token.FIRST);
+
+        map.put("IDENTITY", Token.IDENTITY);
         map.put("LIMIT", Token.LIMIT);
+        map.put("NEXT", Token.NEXT);
+        map.put("NOWAIT", Token.NOWAIT);
+        map.put("OF", Token.OF);
+
         map.put("OFFSET", Token.OFFSET);
-        map.put("WINDOW", Token.WINDOW);
+        map.put("ONLY", Token.ONLY);
+        map.put("OVER", Token.OVER);
+        map.put("RECURSIVE", Token.RECURSIVE);
+        map.put("RESTART", Token.RESTART);
+
+        map.put("RESTRICT", Token.RESTRICT);
+        map.put("RETURNING", Token.RETURNING);
         map.put("ROW", Token.ROW);
         map.put("ROWS", Token.ROWS);
-        map.put("ONLY", Token.ONLY);
-        map.put("FIRST", Token.FIRST);
-        map.put("NEXT", Token.NEXT);
-        map.put("FETCH", Token.FETCH);
-        map.put("OF", Token.OF);
         map.put("SHARE", Token.SHARE);
-        map.put("NOWAIT", Token.NOWAIT);
-        map.put("RECURSIVE", Token.RECURSIVE);
-        map.put("WITH", Token.WITH);
-        map.put("RESTART", Token.RESTART);
-        map.put("CONTINUE", Token.CONTINUE);
-        map.put("IDENTITY", Token.IDENTITY);
-        map.put("CASCADE", Token.CASCADE);
-        map.put("RESTRICT", Token.RESTRICT);
-        map.put("USING", Token.USING);
-        map.put("CURRENT", Token.CURRENT);
-        map.put("RETURNING", Token.RETURNING);
-        map.put("OVER", Token.OVER);
 
-        DEFAULT_MYSQL_KEYWORDS = new Keywords(map);
+        map.put("USING", Token.USING);
+        map.put("WINDOW", Token.WINDOW);
+        map.put("WITH", Token.WITH);
+
+        DEFAULT_PG_KEYWORDS = new Keywords(map);
     }
 
     public PGLexer(String input){
         super(input);
-        super.keywods = DEFAULT_MYSQL_KEYWORDS;
+        super.keywods = DEFAULT_PG_KEYWORDS;
     }
 }
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java
index f5bd0817c5..ad8ae3b1cb 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/sqlserver/parser/SQLServerLexer.java
@@ -13,79 +13,13 @@ public class SQLServerLexer extends Lexer {
 
     static {
         Map<String, Token> map = new HashMap<String, Token>();
-        map.put("EXISTS", Token.EXISTS);
-        map.put("THEN", Token.THEN);
-        map.put("AS", Token.AS);
-        map.put("GROUP", Token.GROUP);
-        map.put("BY", Token.BY);
-        map.put("HAVING", Token.HAVING);
-        map.put("DELETE", Token.DELETE);
-        map.put("ORDER", Token.ORDER);
-        map.put("INDEX", Token.INDEX);
-        map.put("FOR", Token.FOR);
-        map.put("SCHEMA", Token.SCHEMA);
-        map.put("FOREIGN", Token.FOREIGN);
-        map.put("REFERENCES", Token.REFERENCES);
-        map.put("CHECK", Token.CHECK);
-        map.put("PRIMARY", Token.PRIMARY);
-        map.put("KEY", Token.KEY);
-        map.put("CONSTRAINT", Token.CONSTRAINT);
-        map.put("DEFAULT", Token.DEFAULT);
-        map.put("VIEW", Token.VIEW);
-        map.put("CREATE", Token.CREATE);
-        map.put("VALUES", Token.VALUES);
-        map.put("ALTER", Token.ALTER);
-        map.put("TABLE", Token.TABLE);
-        map.put("DROP", Token.DROP);
-        map.put("SET", Token.SET);
-        map.put("INTO", Token.INTO);
-        map.put("UPDATE", Token.UPDATE);
-        map.put("NULL", Token.NULL);
-        map.put("IS", Token.IS);
-        map.put("NOT", Token.NOT);
-        map.put("SELECT", Token.SELECT);
-        map.put("INSERT", Token.INSERT);
-        map.put("FROM", Token.FROM);
-        map.put("WHERE", Token.WHERE);
-        map.put("AND", Token.AND);
-        map.put("OR", Token.OR);
-        map.put("XOR", Token.XOR);
-        map.put("DISTINCT", Token.DISTINCT);
-        map.put("UNIQUE", Token.UNIQUE);
-        map.put("ALL", Token.ALL);
-        map.put("UNION", Token.UNION);
-        map.put("INTERSECT", Token.INTERSECT);
-        map.put("MINUS", Token.MINUS);
-        map.put("INNER", Token.INNER);
-        map.put("LEFT", Token.LEFT);
-        map.put("RIGHT", Token.RIGHT);
-        map.put("FULL", Token.FULL);
-        map.put("ON", Token.ON);
-        map.put("OUTER", Token.OUTER);
-        map.put("JOIN", Token.JOIN);
-        map.put("NEW", Token.NEW);
-        map.put("CASE", Token.CASE);
-        map.put("WHEN", Token.WHEN);
-        map.put("END", Token.END);
-        map.put("WHEN", Token.WHEN);
-        map.put("ELSE", Token.ELSE);
-        map.put("EXISTS", Token.EXISTS);
-        map.put("CAST", Token.CAST);
-        map.put("IN", Token.IN);
-        map.put("ASC", Token.ASC);
-        map.put("DESC", Token.DESC);
-        map.put("LIKE", Token.LIKE);
-        map.put("ESCAPE", Token.ESCAPE);
-        map.put("BETWEEN", Token.BETWEEN);
-        map.put("INTERVAL", Token.INTERVAL);
-        map.put("LOCK", Token.LOCK);
-        map.put("SOME", Token.SOME);
-        map.put("ANY", Token.ANY);
-
-        map.put("WITH", Token.WITH);
+        
+        map.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords());
+        
         map.put("CURSOR", Token.CURSOR);
         map.put("TOP", Token.TOP);
         map.put("USE", Token.USE);
+        map.put("WITH", Token.WITH);
 
         DEFAULT_SQL_SERVER_KEYWORDS = new Keywords(map);
     }
diff --git a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java
index 6c9fff7ea2..2daf5327e0 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java
@@ -17,7 +17,6 @@ package com.alibaba.druid.sql.parser;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * @author wenshao<szujobs@hotmail.com>
diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
index adfb2ab012..0c9623da41 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -368,6 +368,10 @@ public class SQLExprParser extends SQLParser {
                 sqlExpr = new SQLIdentifierExpr("RIGHT");
                 lexer.nextToken();
                 break;
+            case DATABASE:
+                sqlExpr = new SQLIdentifierExpr("DATABASE");
+                lexer.nextToken();
+                break;
             case LOCK:
                 sqlExpr = new SQLIdentifierExpr("LOCK");
                 lexer.nextToken();
diff --git a/src/test/java/com/alibaba/druid/sql/KeywordsTest.java b/src/test/java/com/alibaba/druid/sql/KeywordsTest.java
index e1ccada64e..8ed1688929 100644
--- a/src/test/java/com/alibaba/druid/sql/KeywordsTest.java
+++ b/src/test/java/com/alibaba/druid/sql/KeywordsTest.java
@@ -6,13 +6,13 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import com.alibaba.druid.sql.dialect.mysql.parser.MySqlLexer;
+import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerLexer;
 import com.alibaba.druid.sql.parser.Keywords;
 
 public class KeywordsTest extends TestCase {
 
     public void test_sort() throws Exception {
-        List<String> list = new ArrayList<String>(MySqlLexer.DEFAULT_MYSQL_KEYWORDS.getKeywords().keySet());
+        List<String> list = new ArrayList<String>(SQLServerLexer.DEFAULT_SQL_SERVER_KEYWORDS.getKeywords().keySet());
 
         Collections.sort(list);