Fix more unit tests

Author: cgivre

exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/conversion/DrillRexBuilder.java

@@ -144,19 +144,24 @@ public RexNode makeCast(RelDataType type, RexNode exp, boolean matchNullability)
       return makeAbstractCast(type, exp);
     }
 
-    // for the case when BigDecimal literal has a scale or precision
-    // that differs from the value from specified RelDataType, cast cannot be removed
-    // TODO: remove this code when CALCITE-1468 is fixed
-    if (type.getSqlTypeName() == SqlTypeName.DECIMAL && exp instanceof RexLiteral) {
+    // Validate DECIMAL precision and scale for all DECIMAL casts
+    // This catches user-specified invalid types before DrillTypeFactory auto-fixes them
+    if (type.getSqlTypeName() == SqlTypeName.DECIMAL) {
       int precision = type.getPrecision();
       int scale = type.getScale();
       validatePrecisionAndScale(precision, scale);
-      Comparable<?> value = ((RexLiteral) exp).getValueAs(Comparable.class);
-      if (value instanceof BigDecimal) {
-        BigDecimal bigDecimal = (BigDecimal) value;
-        DecimalUtility.checkValueOverflow(bigDecimal, precision, scale);
-        if (bigDecimal.precision() != precision || bigDecimal.scale() != scale) {
-          return makeAbstractCast(type, exp);
+
+      // for the case when BigDecimal literal has a scale or precision
+      // that differs from the value from specified RelDataType, cast cannot be removed
+      // TODO: remove this code when CALCITE-1468 is fixed
+      if (exp instanceof RexLiteral) {
+        Comparable<?> value = ((RexLiteral) exp).getValueAs(Comparable.class);
+        if (value instanceof BigDecimal) {
+          BigDecimal bigDecimal = (BigDecimal) value;
+          DecimalUtility.checkValueOverflow(bigDecimal, precision, scale);
+          if (bigDecimal.precision() != precision || bigDecimal.scale() != scale) {
+            return makeAbstractCast(type, exp);
+          }
         }
       }
     }

exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java

@@ -159,9 +159,10 @@ public void testSimpleDecimalArithmetic() throws Exception {
 
             // NOTE: Calcite 1.38 changed DECIMAL arithmetic behavior affecting scale in results.
             // Multiplication results now include decimal scale in string representation.
+            // Values calculated: row2: 11.1*11.1=123.21, row5: 987654321.1*123.1=121580246927.41
             String addOutput[] = {"123456888.0", "22.2", "0.2", "-0.2", "-987654444.2","-3.0"};
             String subtractOutput[] = {"123456690.0", "0.0", "0.0", "0.0", "-987654198.0", "-1.0"};
-            String multiplyOutput[] = {"12222222111.00", "123.21", "0.01", "0.01",  "121580246926.01", "2.03"};
+            String multiplyOutput[] = {"12222222111.00", "123.21", "0.01", "0.01",  "121580246927.41", "2.03"};
 
             Iterator<VectorWrapper<?>> itr = batchLoader.iterator();
 
@@ -213,7 +214,7 @@ public void testComplexDecimal() throws Exception {
             // NOTE: Calcite 1.38 changed DECIMAL arithmetic behavior affecting precision and scale in results.
             // Results may now include more decimal places in string representation.
             String addOutput[] = {"-99999998877.700000000", "11.423456789", "123456789.100000000", "-0.119998000", "100000000112.423456789", "-99999999879.907000000", "123456789123456801.300000000"};
-            String subtractOutput[] = {"-100000001124.300000000", "10.823456789", "-123456788.899999999", "-0.120002000", "99999999889.823456789", "-100000000122.093000000", "123456789123456776.700000000"};
+            String subtractOutput[] = {"-100000001124.300000000", "10.823456789", "-123456788.900000000", "-0.120002000", "99999999889.823456789", "-100000000122.093000000", "123456789123456776.700000000"};
 
             Iterator<VectorWrapper<?>> itr = batchLoader.iterator();