Updating tests

Author: matthewmturner

datafusion/src/logical_plan/expr.rs

@@ -942,11 +942,7 @@ impl std::fmt::Display for Expr {
                 ref right,
                 ref op,
             } => write!(f, "{} {} {}", left, op, right),
-<<<<<<< HEAD
             _ => write!(f, "{:?}", self),
-=======
-            _ => write!(f, "{}", ""),
->>>>>>> 8f0d241cc40ae602bf365b92890b5e6c9b7cbf3b
         }
     }
 }

datafusion/src/sql/planner.rs

@@ -2332,8 +2332,8 @@ mod tests {
                    GROUP BY first_name
                    HAVING max_age_plus_one > 100";
         let expected =
-            "Projection: #person.first_name, #MAX(person.age) Plus Int64(1) AS max_age_plus_one\
-                        \n  Filter: #MAX(person.age) Plus Int64(1) Gt Int64(100)\
+            "Projection: #person.first_name, #MAX(person.age) + Int64(1) AS max_age_plus_one\
+                        \n  Filter: #MAX(person.age) + Int64(1) > Int64(100)\
                         \n    Aggregate: groupBy=[[#person.first_name]], aggr=[[MAX(#person.age)]]\
                         \n      TableScan: person projection=None";
         quick_test(sql, expected);
@@ -2347,8 +2347,8 @@ mod tests {
                    GROUP BY first_name
                    HAVING MAX(age) > 100 AND MIN(id - 2) < 50";
         let expected = "Projection: #person.first_name, #MAX(person.age)\
-                        \n  Filter: #MAX(person.age) Gt Int64(100) And #MIN(person.id Minus Int64(2)) Lt Int64(50)\
-                        \n    Aggregate: groupBy=[[#person.first_name]], aggr=[[MAX(#person.age), MIN(#person.id Minus Int64(2))]]\
+                        \n  Filter: #MAX(person.age) > Int64(100) AND #MIN(person.id Minus Int64(2)) < Int64(50)\
+                        \n    Aggregate: groupBy=[[#person.first_name]], aggr=[[MAX(#person.age), MIN(#person.id - Int64(2))]]\
                         \n      TableScan: person projection=None";
         quick_test(sql, expected);
     }