优化hive sql set hivevar的sql生成 #5901

alibaba · May 10, 2024 · c81f364 · c81f364
1 parent 86f4acf
commit c81f364
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 1 deletion.
diff --git a/core/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/core/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java
@@ -891,7 +891,11 @@ && isPrettyFormat()
 
             boolean printOpSpace = true;
             if (relational) {
-                println();
+                if (dbType == DbType.hive && x.getParent() instanceof SQLMethodInvokeExpr) {
+                    print(' ');
+                } else {
+                    println();
+                }
             } else {
                 if (operator == SQLBinaryOperator.Modulus
                         && DbType.oracle == dbType

diff --git a/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5901.java b/core/src/test/java/com/alibaba/druid/bvt/sql/hive/issues/Issue5901.java
@@ -0,0 +1,39 @@
+package com.alibaba.druid.bvt.sql.hive.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 org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author lizongbo
+ * @see <a href="https://github.com/alibaba/druid/issues/5901>Issue来源</a>
+ */
+public class Issue5901 {
+
+    @Test
+    public void test_parse_set() {
+        for (DbType dbType : new DbType[]{DbType.hive}) {
+            for (String sql : new String[]{
+                "SET hivevar:account_period = IF(${hivevar:now_month} >= 3 and ${hivevar:now_month} < 6, CONCAT(${hivevar:now_year}, '-03XYZ'), ${hivevar:now_year});\n"
+                ,
+            }) {
+                SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType);
+                List<SQLStatement> statementList = parser.parseStatementList();
+                assertEquals(1, statementList.size());
+                assertEquals(
+                    "SET hivevar:account_period = IF(${hivevar:now_month} >= 3 AND ${hivevar:now_month} < 6, CONCAT(${hivevar:now_year}, '-03XYZ'), ${hivevar:now_year});"
+                    , statementList.get(0).toString());
+                SQLParseAssertUtil.assertParseSql(sql, dbType);
+            }
+        }
+    }
+
+}