[CALCITE-5299] JDBC adapter sometimes adds unnecessary parentheses ar…

…ound SELECT in WITH body

Remove SET_QUERY from SqlKind#EXPRESSION.

This closes apache#2938

core/src/main/java/org/apache/calcite/sql/SqlKind.java

@@ -1199,7 +1199,7 @@ public enum SqlKind {
                   NULLS_FIRST, NULLS_LAST, COLLECTION_TABLE, TABLESAMPLE,
                   VALUES, WITH, WITH_ITEM, ITEM, SKIP_TO_FIRST, SKIP_TO_LAST,
                   JSON_VALUE_EXPRESSION, UNNEST),
-              AGGREGATE, DML, DDL));
+              SET_QUERY, AGGREGATE, DML, DDL));
 
   /**
    * Category of all SQL statement types.

core/src/main/java/org/apache/calcite/sql/SqlWith.java

@@ -103,8 +103,9 @@ private SqlWithOperator() {
       }
       writer.endList(frame1);
       final SqlWriter.Frame frame2 =
-          writer.startList(SqlWriter.FrameTypeEnum.SIMPLE);
-      with.body.unparse(writer, 100, 100);
+          writer.startList(SqlWriter.FrameTypeEnum.WITH_BODY);
+      with.body.unparse(writer,
+          SqlWithOperator.INSTANCE.getLeftPrec(), SqlWithOperator.INSTANCE.getRightPrec());
       writer.endList(frame2);
       writer.endList(frame);
     }

core/src/main/java/org/apache/calcite/sql/SqlWriter.java

@@ -149,6 +149,11 @@ enum FrameTypeEnum implements FrameType {
      */
     WITH,
 
+    /**
+     * The body query of WITH.
+     */
+    WITH_BODY,
+
     /**
      * OFFSET clause.
      *

core/src/main/java/org/apache/calcite/sql/pretty/SqlPrettyWriter.java

@@ -398,7 +398,7 @@ public void setWindowDeclListNewline(boolean windowDeclListNewline) {
     return (frame == null)
         || (frame.frameType == FrameTypeEnum.SELECT)
         || (frame.frameType == FrameTypeEnum.ORDER_BY)
-        || (frame.frameType == FrameTypeEnum.WITH)
+        || (frame.frameType == FrameTypeEnum.WITH_BODY)
         || (frame.frameType == FrameTypeEnum.SETOP);
   }