Update AstBuilder.scala

Author: AngersZhuuuu

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -623,20 +623,6 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with SQLConfHelper with Logg
     UnresolvedHaving(predicate, plan)
   }
 
-  /**
-   * Create a logical plan treat having as where when without GROUP BY
-   */
-  private def withHavingClauseAsWhere(
-      ctx: HavingClauseContext, plan: LogicalPlan): LogicalPlan = {
-    // Note that we add a cast to non-predicate expressions. If the expression itself is
-    // already boolean, the optimizer will get rid of the unnecessary cast.
-    val predicate = expression(ctx.booleanExpression) match {
-      case p: Predicate => p
-      case e => Cast(e, BooleanType)
-    }
-    Filter(predicate, plan)
-  }
-
   /**
    * Create a logical plan using a where clause.
    */
@@ -728,7 +714,11 @@ class AstBuilder extends SqlBaseBaseVisitor[AnyRef] with SQLConfHelper with Logg
     val withProject = if (aggregationClause == null && havingClause != null) {
       if (conf.getConf(SQLConf.LEGACY_HAVING_WITHOUT_GROUP_BY_AS_WHERE)) {
         // If the legacy conf is set, treat HAVING without GROUP BY as WHERE.
-        withHavingClauseAsWhere(havingClause, createProject())
+        val predicate = expression(havingClause.booleanExpression) match {
+          case p: Predicate => p
+          case e => Cast(e, BooleanType)
+        }
+        Filter(predicate, createProject())
       } else {
         // According to SQL standard, HAVING without GROUP BY means global aggregate.
         withHavingClause(havingClause, Aggregate(Nil, namedExpressions, withFilter))