work 2

Author: flash1293

docs/reference/query-languages/esql/_snippets/functions/functionNamedParams/date_parse.md

@@ -644,22 +644,25 @@ emp_no:integer  | new_date:datetime          | birth_date:datetime       | bool:
 10050           | 1958-05-21T00:00:00.000Z   | 1958-05-21T00:00:00.000Z  | true
 ;
 
-evalDateParseWithTimezone
-row a = "10-10-25" | eval b = date_parse(a, "dd-mm-yyyy", {"time_zone":"Europe/Paris"}) | keep b;
+evalDateParseWithTimezoneOption
+required_capability: date_parse_options
+row a = "10-10-2025" | eval b = date_parse("dd-mm-yyyy", a, {"time_zone":"Europe/Paris"}) | keep b;
 
 b:datetime
 2024-12-31T23:00:00.000Z
 ;
 
-evalDateParseWithLocale
-row a = "10 septembre 2025" | eval b = date_parse(a, "dd-mm-yyyy", {"locale":"fr"}) | keep b;
+evalDateParseWithLocaleOption
+required_capability: date_parse_options
+row a = "10 septembre 2025" | eval b = date_parse("dd MMMM yyyy", a, {"locale":"fr"}) | keep b;
 
 b:datetime
 2025-09-10T00:00:00.000Z
 ;
 
-evalDateParseWithLocaleAndTimezone
-row a = "10 septembre 2025" | eval b = date_parse(a, "dd-mm-yyyy", {"locale":"fr","time_zone":"Europe/Paris"}) | keep b;
+evalDateParseWithLocaleAndTimezoneOption
+required_capability: date_parse_options
+row a = "10 septembre 2025" | eval b = date_parse("dd MMMM yyyy", a, {"locale":"fr","time_zone":"Europe/Paris"}) | keep b;
 
 b:datetime
 2025-09-09T22:00:00.000Z

docs/reference/query-languages/esql/_snippets/functions/layout/date_parse.md

@@ -1516,6 +1516,11 @@ public enum Cap {
          */
         FIX_FILTER_ORDINALS,
 
+        /**
+         * Optional options argument for DATE_PARSE
+         */
+        DATE_PARSE_OPTIONS,
+
         ;
 
         private final boolean enabled;

docs/reference/query-languages/esql/_snippets/functions/parameters/date_parse.md

@@ -1042,10 +1042,15 @@ protected static <T extends Function> FunctionDefinition def(Class<T> function,
                 throw new QlIllegalArgumentException("expects one, two or three arguments");
             } else if (hasMinimumTwo && (children.size() > 3 || children.size() < 2)) {
                 throw new QlIllegalArgumentException("expects two or three arguments");
-            } else if (hasMinimumTwo == false && children.size() != 3) {
+            } else if (hasMinimumOne == false && hasMinimumTwo == false && children.size() != 3) {
                 throw new QlIllegalArgumentException("expects exactly three arguments");
             }
-            return ctorRef.build(source, children.get(0), children.get(1), children.size() == 3 ? children.get(2) : null);
+            return ctorRef.build(
+                source,
+                children.get(0),
+                children.size() > 1 ? children.get(1) : null,
+                children.size() == 3 ? children.get(2) : null
+            );
         };
         return def(function, builder, names);
     }

docs/reference/query-languages/esql/_snippets/functions/types/date_parse.md

@@ -97,7 +97,7 @@ public DateParse(
                     valueHint = { "standard" },
                     description = "The locale to use when parsing the date, relevant when parsing month names or week days."
                 ) },
-            description = "(Optional) Additional options for date parsing as <<esql-function-named-params,function named parameters>>.",
+            description = "(Optional) Additional options for date parsing, specifying time zone and locale as <<esql-function-named-params,function named parameters>>.",
             optional = true
         ) Expression options
     ) {
@@ -134,7 +134,6 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeNamedWriteable(children().get(0));
         out.writeOptionalNamedWriteable(children().size() > 1 ? children().get(1) : null);
         out.writeOptionalNamedWriteable(children().size() > 2 ? children().get(2) : null);
-        out.writeOptionalNamedWriteable(children().size() > 3 ? children().get(3) : null);
     }
 
     @Override

docs/reference/query-languages/esql/images/functions/date_parse.svg

@@ -167,10 +167,10 @@ public void testInvalidPattern() {
 
     public void testInvalidLocale() {
         String pattern = "YYYY";
-        String locale = "NON-EXISTING-LOCALE";
+        String locale = "nonexistinglocale";
         DriverContext driverContext = driverContext();
-        InvalidArgumentException e = expectThrows(
-            InvalidArgumentException.class,
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
             () -> evaluator(
                 new DateParse(
                     Source.EMPTY,
@@ -193,8 +193,8 @@ public void testInvalidTimezone() {
         String pattern = "YYYY";
         String timezone = "NON-EXISTING-TIMEZONE";
         DriverContext driverContext = driverContext();
-        InvalidArgumentException e = expectThrows(
-            InvalidArgumentException.class,
+        IllegalArgumentException e = expectThrows(
+            IllegalArgumentException.class,
             () -> evaluator(
                 new DateParse(
                     Source.EMPTY,