back out workaround for autocasting

not-napoleon · Mar 29, 2024 · 8c0d42e · 8c0d42e
1 parent 4bcca86
commit 8c0d42e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 34 deletions.
diff --git a/...lasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EsqlBinaryComparison.java b/...lasticsearch/xpack/esql/evaluator/predicate/operator/comparison/EsqlBinaryComparison.java
@@ -123,12 +123,6 @@ protected TypeResolution checkCompatibility() {
             return new TypeResolution(formatIncompatibleTypesMessage());
         }
 
-        // String literals (and only literals) can be cast up to dates
-        if ((DataTypes.isDateTime(leftType) && DataTypes.isString(rightType) && right() instanceof Literal)
-            || (DataTypes.isDateTime(rightType) && DataTypes.isString(leftType) && left() instanceof Literal)) {
-            return TypeResolution.TYPE_RESOLVED;
-        }
-
         if ((leftType.isNumeric() && rightType.isNumeric())
             || (DataTypes.isString(leftType) && DataTypes.isString(rightType))
             || leftType.equals(rightType)

diff --git a/...esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java b/...esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java
@@ -945,21 +945,6 @@ public static List<TypedDataSupplier> dateCases() {
         );
     }
 
-    public static List<TypedDataSupplier> datesAsStringLiteralsCases() {
-        List<TypedDataSupplier> cases = new ArrayList<>();
-        for (TypedDataSupplier dateCase : dateCases()) {
-            cases.add(
-                new TypedDataSupplier(
-                    "<" + dateCase.name + "as string>",
-                    () -> EsqlDataTypeConverter.dateTimeToString((long) dateCase.supplier.get()),
-                    DataTypes.KEYWORD,
-                    true
-                )
-            );
-        }
-        return cases;
-    }
-
     public static List<TypedDataSupplier> datePeriodCases() {
         return List.of(
             new TypedDataSupplier("<zero date period>", () -> Period.ZERO, EsqlDataTypes.DATE_PERIOD),

diff --git a/...va/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java b/...va/org/elasticsearch/xpack/esql/expression/predicate/operator/comparison/EqualsTests.java
@@ -128,19 +128,6 @@ public static Iterable<Object[]> parameters() {
             )
         );
 
-        suppliers.addAll(
-            TestCaseSupplier.forBinaryNotCasting(
-                "EqualsLongsEvaluator",
-                "lhs",
-                "rhs",
-                Object::equals,
-                DataTypes.BOOLEAN,
-                TestCaseSupplier.dateCases(),
-                TestCaseSupplier.datesAsStringLiteralsCases(),
-                List.of()
-            )
-        );
-
         List<TestCaseSupplier.TypedDataSupplier> lhsSuppliers = new ArrayList<>();
         List<TestCaseSupplier.TypedDataSupplier> rhsSuppliers = new ArrayList<>();
         for (DataType type : AbstractConvertFunction.STRING_TYPES) {