Skip to content

Commit c4e3d19

Browse files
committed
Fix assertions to add M
1 parent 3a6d00b commit c4e3d19

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7973,39 +7973,39 @@ public void testToDatePeriodTimeDurationInvalidIntervals() {
79737973
from types | EVAL interval = "3 ours", x = date + interval::time_duration"""));
79747974
assertEquals(
79757975
"Invalid interval value in [interval::time_duration], expected integer followed by one of "
7976-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
7976+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [3 ours]",
79777977
e.getMessage()
79787978
);
79797979

79807980
e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
79817981
from types | EVAL interval = "- 3 hours", x = date + interval::time_duration"""));
79827982
assertEquals(
79837983
"Invalid interval value in [interval::time_duration], expected integer followed by one of "
7984-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [- 3 hours]",
7984+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [- 3 hours]",
79857985
e.getMessage()
79867986
);
79877987

79887988
e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
79897989
from types | EVAL interval = "3 ours", x = date - to_timeduration(interval)"""));
79907990
assertEquals(
79917991
"Invalid interval value in [to_timeduration(interval)], expected integer followed by one of "
7992-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
7992+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [3 ours]",
79937993
e.getMessage()
79947994
);
79957995

79967996
e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
79977997
from types | EVAL interval = "- 3 hours", x = date - to_timeduration(interval)"""));
79987998
assertEquals(
79997999
"Invalid interval value in [to_timeduration(interval)], expected integer followed by one of "
8000-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [- 3 hours]",
8000+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [- 3 hours]",
80018001
e.getMessage()
80028002
);
80038003

80048004
e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
80058005
from types | EVAL interval = "3.5 hours", x = date - to_timeduration(interval)"""));
80068006
assertEquals(
80078007
"Invalid interval value in [to_timeduration(interval)], expected integer followed by one of "
8008-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3.5 hours]",
8008+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [3.5 hours]",
80098009
e.getMessage()
80108010
);
80118011

@@ -8029,23 +8029,23 @@ public void testToDatePeriodTimeDurationInvalidIntervals() {
80298029
row x = "2024-01-01"::datetime | eval y = x + "3 ours"::time_duration"""));
80308030
assertEquals(
80318031
"Invalid interval value in [\"3 ours\"::time_duration], expected integer followed by one of "
8032-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
8032+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [3 ours]",
80338033
e.getMessage()
80348034
);
80358035

80368036
e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
80378037
row x = "2024-01-01"::datetime | eval y = x - to_timeduration("3 ours")"""));
80388038
assertEquals(
80398039
"Invalid interval value in [to_timeduration(\"3 ours\")], expected integer followed by one of "
8040-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3 ours]",
8040+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [3 ours]",
80418041
e.getMessage()
80428042
);
80438043

80448044
e = expectThrows(IllegalArgumentException.class, () -> planTypes("""
80458045
row x = "2024-01-01"::datetime | eval y = x - to_timeduration("3.5 hours")"""));
80468046
assertEquals(
80478047
"Invalid interval value in [to_timeduration(\"3.5 hours\")], expected integer followed by one of "
8048-
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, HOUR, HOURS, H] but got [3.5 hours]",
8048+
+ "[MILLISECOND, MILLISECONDS, MS, SECOND, SECONDS, SEC, S, MINUTE, MINUTES, MIN, M, HOUR, HOURS, H] but got [3.5 hours]",
80498049
e.getMessage()
80508050
);
80518051
}

0 commit comments

Comments
 (0)