fix tests

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/dsl/package.scala

@@ -68,10 +68,10 @@ package object dsl {
     def unary_! : Predicate = Not(expr)
     def unary_~ : Expression = BitwiseNot(expr)
 
-    def + (other: Expression): Expression = Add(expr, other)
-    def - (other: Expression): Expression = Subtract(expr, other)
-    def * (other: Expression): Expression = Multiply(expr, other)
-    def / (other: Expression): Expression = Divide(expr, other)
+    def + (other: Expression): Expression = UnresolvedAdd(expr, other)
+    def - (other: Expression): Expression = UnresolvedSubtract(expr, other)
+    def * (other: Expression): Expression = UnresolvedMultiply(expr, other)
+    def / (other: Expression): Expression = UnresolvedDivide(expr, other)
     def div (other: Expression): Expression = IntegralDivide(expr, other)
     def % (other: Expression): Expression = Remainder(expr, other)
     def & (other: Expression): Expression = BitwiseAnd(expr, other)

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

@@ -1696,9 +1696,12 @@ class AstBuilder(conf: SQLConf) extends SqlBaseBaseVisitor[AnyRef] with Logging
    */
   override def visitFrameBound(ctx: FrameBoundContext): Expression = withOrigin(ctx) {
     def value: Expression = {
-      val e = expression(ctx.expression)
-      validate(e.resolved && e.foldable, "Frame bound value must be a literal.", ctx)
-      e
+      expression(ctx.expression) match {
+        case u: UnresolvedBinaryExpression if u.childrenResolved && u.foldable => u
+        case e =>
+          validate(e.resolved && e.foldable, "Frame bound value must be a literal.", ctx)
+          e
+      }
     }
 
     ctx.boundType.getType match {

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala

@@ -307,11 +307,11 @@ class ExpressionParserSuite extends AnalysisTest {
       ("unbounded preceding", UnboundedPreceding, CurrentRow),
       ("2147483648 preceding", -Literal(2147483648L), CurrentRow),
       ("10 preceding", -Literal(10), CurrentRow),
-      ("3 + 1 preceding", -Add(Literal(3), Literal(1)), CurrentRow),
+      ("3 + 1 preceding", -UnresolvedAdd(Literal(3), Literal(1)), CurrentRow),
       ("0 preceding", -Literal(0), CurrentRow),
       ("current row", CurrentRow, CurrentRow),
       ("0 following", Literal(0), CurrentRow),
-      ("3 + 1 following", Add(Literal(3), Literal(1)), CurrentRow),
+      ("3 + 1 following", UnresolvedAdd(Literal(3), Literal(1)), CurrentRow),
       ("10 following", Literal(10), CurrentRow),
       ("2147483649 following", Literal(2147483649L), CurrentRow),
       ("unbounded following", UnboundedFollowing, CurrentRow), // Will fail during analysis
@@ -320,26 +320,28 @@ class ExpressionParserSuite extends AnalysisTest {
       ("between unbounded preceding and 5 following",
         UnboundedPreceding, Literal(5)),
       ("between unbounded preceding and 3 + 1 following",
-        UnboundedPreceding, Add(Literal(3), Literal(1))),
+        UnboundedPreceding, UnresolvedAdd(Literal(3), Literal(1))),
       ("between unbounded preceding and 2147483649 following",
         UnboundedPreceding, Literal(2147483649L)),
       ("between unbounded preceding and current row", UnboundedPreceding, CurrentRow),
       ("between 2147483648 preceding and current row", -Literal(2147483648L), CurrentRow),
       ("between 10 preceding and current row", -Literal(10), CurrentRow),
-      ("between 3 + 1 preceding and current row", -Add(Literal(3), Literal(1)), CurrentRow),
+      ("between 3 + 1 preceding and current row", -UnresolvedAdd(Literal(3), Literal(1)),
+        CurrentRow),
       ("between 0 preceding and current row", -Literal(0), CurrentRow),
       ("between current row and current row", CurrentRow, CurrentRow),
       ("between current row and 0 following", CurrentRow, Literal(0)),
       ("between current row and 5 following", CurrentRow, Literal(5)),
-      ("between current row and 3 + 1 following", CurrentRow, Add(Literal(3), Literal(1))),
+      ("between current row and 3 + 1 following", CurrentRow,
+        UnresolvedAdd(Literal(3), Literal(1))),
       ("between current row and 2147483649 following", CurrentRow, Literal(2147483649L)),
       ("between current row and unbounded following", CurrentRow, UnboundedFollowing),
       ("between 2147483648 preceding and unbounded following",
         -Literal(2147483648L), UnboundedFollowing),
       ("between 10 preceding and unbounded following",
         -Literal(10), UnboundedFollowing),
       ("between 3 + 1 preceding and unbounded following",
-        -Add(Literal(3), Literal(1)), UnboundedFollowing),
+        -UnresolvedAdd(Literal(3), Literal(1)), UnboundedFollowing),
       ("between 0 preceding and unbounded following", -Literal(0), UnboundedFollowing),
 
       // Between partial and full range