Fix ITs that are affected by allowing implicit coercion from number to string (1915/2055)

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLBasicIT.java

@@ -17,7 +17,6 @@
 import org.junit.jupiter.api.Test;
 import org.opensearch.client.Request;
 import org.opensearch.client.ResponseException;
-import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.ppl.PPLIntegTestCase;
 
 public class CalcitePPLBasicIT extends PPLIntegTestCase {
@@ -454,17 +453,28 @@ public void testBetweenWithDifferentTypes2() throws IOException {
     verifyDataRows(actual, rows("Hattie", 36), rows("Elinor", 36));
   }
 
+  @Test
+  public void testBetweenWithMixedTypes() throws IOException {
+    JSONObject actual =
+        executeQuery(
+            String.format(
+                "source=%s | where age between '35' and 38 | fields firstname, age",
+                TEST_INDEX_BANK));
+    verifyDataRows(actual, rows("Hattie", 36), rows("Elinor", 36));
+  }
+
   @Test
   public void testBetweenWithIncompatibleTypes() {
+    // Plan: CAST(NUMBER_TO_STRING(38.5:DECIMAL(3, 1))):INTEGER)
     Throwable e =
         assertThrowsWithReplace(
-            SemanticCheckException.class,
+            NumberFormatException.class,
             () ->
                 executeQuery(
                     String.format(
                         "source=%s | where age between '35' and 38.5 | fields firstname, age",
                         TEST_INDEX_BANK)));
-    verifyErrorMessageContains(e, "BETWEEN expression types are incompatible");
+    verifyErrorMessageContains(e, "For input string: \\\"38.5\\\"");
   }
 
   @Test

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteWhereCommandIT.java

@@ -5,6 +5,13 @@
 
 package org.opensearch.sql.calcite.remote;
 
+import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
+import static org.opensearch.sql.util.MatcherUtils.rows;
+import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
+
+import java.io.IOException;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
 import org.opensearch.sql.ppl.WhereCommandIT;
 
 public class CalciteWhereCommandIT extends WhereCommandIT {
@@ -14,9 +21,14 @@ public void init() throws Exception {
     enableCalcite();
   }
 
-  @Override
-  protected String getIncompatibleTypeErrMsg() {
-    return "In expression types are incompatible: fields type LONG, values type [INTEGER, INTEGER,"
-        + " STRING]";
+  @Test
+  public void testInWithMixedType() throws IOException {
+    // Mixed type coercion only work with Calcite enabled
+    JSONObject result =
+        executeQuery(
+            String.format(
+                "source=%s | where balance in (4180, 5686, '6077') | fields firstname",
+                TEST_INDEX_ACCOUNT));
+    verifyDataRows(result, rows("Hattie"), rows("Dale"), rows("Hughes"));
   }
 }

integ-test/src/test/java/org/opensearch/sql/ppl/WhereCommandIT.java

@@ -5,7 +5,6 @@
 
 package org.opensearch.sql.ppl;
 
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK_WITH_NULL_VALUES;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_DATE_TIME;
@@ -15,11 +14,8 @@
 import static org.opensearch.sql.util.MatcherUtils.verifySchema;
 
 import java.io.IOException;
-import java.util.stream.Collectors;
-import org.hamcrest.MatcherAssert;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
-import org.opensearch.sql.data.type.ExprCoreType;
 
 public class WhereCommandIT extends PPLIntegTestCase {
 
@@ -242,29 +238,6 @@ public void testWhereWithNotIn() throws IOException {
     verifyDataRows(result, rows("Amber"), rows("Dale"));
   }
 
-  @Test
-  public void testInWithIncompatibleType() {
-    Exception e =
-        assertThrows(
-            Exception.class,
-            () -> {
-              executeQuery(
-                  String.format(
-                      "source=%s | where balance in (4180, 5686, '6077') | fields firstname",
-                      TEST_INDEX_ACCOUNT));
-            });
-    MatcherAssert.assertThat(e.getMessage(), containsString(getIncompatibleTypeErrMsg()));
-  }
-
-  protected String getIncompatibleTypeErrMsg() {
-    return String.format(
-        "function expected %s, but got %s",
-        ExprCoreType.coreTypes().stream()
-            .map(type -> String.format("[%s,%s]", type.typeName(), type.typeName()))
-            .collect(Collectors.joining(",", "{", "}")),
-        "[LONG,STRING]");
-  }
-
   @Test
   public void testFilterScriptPushDown() throws IOException {
     JSONObject actual =