优化中括号解析逻辑 #5908

优化中括号解析逻辑 #5908 , #5743
alibaba · May 14, 2024 · 3c2e4d9 · 3c2e4d9
1 parent cddd2cb
commit 3c2e4d9
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 9 deletions.
diff --git a/core/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/core/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -1371,15 +1371,12 @@ public SQLExpr primary() {
                 }
                 throw new ParserException("ERROR. " + lexer.info());
             case LBRACKET:
-                if (dbType == DbType.odps || dbType == DbType.clickhouse) {
-                    SQLArrayExpr array = new SQLArrayExpr();
-                    lexer.nextToken();
-                    this.exprList(array.getValues(), array);
-                    accept(Token.RBRACKET);
-                    sqlExpr = array;
-                    break;
-                }
-                throw new ParserException("ERROR. " + lexer.info());
+                SQLArrayExpr arrayTmp = new SQLArrayExpr();
+                lexer.nextToken();
+                this.exprList(arrayTmp.getValues(), arrayTmp);
+                accept(Token.RBRACKET);
+                sqlExpr = arrayTmp;
+                break;
             case ON:
                 if (dbType == DbType.postgresql) {
                     String methodName = lexer.stringVal();

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5908.java b/core/src/test/java/com/alibaba/druid/bvt/sql/mysql/issues/Issue5908.java
@@ -0,0 +1,57 @@
+package com.alibaba.druid.bvt.sql.mysql.issues;
+
+import java.util.List;
+
+import com.alibaba.druid.DbType;
+import com.alibaba.druid.sql.SQLParseAssertUtil;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.parser.SQLParserUtils;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.druid.sql.parser.Token;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author lizongbo
+ * @see <a href="https://github.com/alibaba/druid/issues/5908" >Issue来源</a>
+ */
+public class Issue5908 {
+
+    @Test
+    public void test_parse_brackets() {
+        for (DbType dbType : new DbType[]{DbType.mysql}) {
+            for (String sql : new String[]{
+                "select array_length(['1'])", // https://github.com/alibaba/druid/issues/5743
+                "SELECT CONCAT(date_id, ' ', e1, e2) hour_minute1 \n"
+                    + "from (select 1 k1) AS t,\n"
+                    + "(SELECT date_id FROM dim_date \n"
+                    + "WHERE date_id between date_format(DATE_SUB(20240513, INTERVAL 7 DAY), 'yyyy-MM-dd') AND date_format(20240513, 'yyyy-MM-dd')) dd\n"
+                    + "lateral VIEW explode(['00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10', '11', '12', '13', '14', '15', '16', '17', '18', '19', '20', '21', '22', '23']) tmp1 as e1\n"
+                    + "lateral VIEW explode([':00:00', ':30:00']) tmp2 AS e2;",
+            }) {
+                SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType);
+                List<SQLStatement> statementList = parser.parseStatementList();
+                System.out.println(statementList);
+                assertEquals(1, statementList.size());
+                SQLParseAssertUtil.assertParseSql(sql, dbType);
+            }
+        }
+    }
+
+    @Test
+    public void test_parse_brackets2() {
+        for (DbType dbType : new DbType[]{DbType.postgresql}) {
+            for (String sql : new String[]{
+                "SELECT t.name AS 用户（一类）名称 FROM user_table t",
+            }) {
+                SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType);
+                List<SQLStatement> statementList = parser.parseStatementList();
+                System.out.println(statementList);
+                assertEquals(1, statementList.size());
+                SQLParseAssertUtil.assertParseSql(sql, dbType);
+            }
+        }
+    }
+}