Merge pull request alibaba#822 from abirdman/master

兼容mysql的另一种语法：show columns from tableName in databaseName;
chenminandy · May 7, 2015 · 3d91aed · 3d91aed
2 parents 3546774 + 1c62c49
commit 3d91aed
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
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
@@ -1482,7 +1482,7 @@ private MySqlShowColumnsStatement parseShowColumns() {
             SQLName table = exprParser.name();
             stmt.setTable(table);
 
-            if (lexer.token() == Token.FROM) {
+            if (lexer.token() == Token.FROM || lexer.token() == Token.IN) {
                 lexer.nextToken();
                 SQLName database = exprParser.name();
                 stmt.setDatabase(database);

diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/SHOW_COLUMNS_Syntax_Test.java
@@ -59,6 +59,17 @@ public void test_2() throws Exception {
 
         Assert.assertEquals("SHOW COLUMNS FROM mydb.mytable;", text);
     }
+
+    public void test_3() throws Exception {
+        String sql = "SHOW COLUMNS FROM mytable IN mydb;";
+
+        SQLStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> stmtList = parser.parseStatementList();
+
+        String text = output(stmtList);
+
+        Assert.assertEquals("SHOW COLUMNS FROM mydb.mytable;", text);
+    }
 
     private String output(List<SQLStatement> stmtList) {
         StringBuilder out = new StringBuilder();