Last one?

nik9000 · Aug 22, 2023 · 6b72f3e · 6b72f3e
1 parent 8ae145c
commit 6b72f3e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/x-pack/plugin/esql/build.gradle b/x-pack/plugin/esql/build.gradle
@@ -45,6 +45,10 @@ tasks.named("compileJava").configure {
   options.compilerArgs.addAll(["-s", "${projectDir}/src/main/java/generated"])
 }
 
+tasks.named("javadoc").configure {
+  include("${projectDir}/src/main/java/generated")
+}
+
 sourceSets.main.java {
   exclude 'generated/**'
 }

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/string.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/string.csv-spec
@@ -275,23 +275,6 @@ emp_no:integer | name:keyword
 10010 | Duangkaew Piveteau
 ;
 
-concatSingle
-from employees | sort emp_no | limit 10 | eval name = concat(first_name) | keep emp_no, name;
-
-emp_no:integer | name:keyword
-10001 | Georgi
-10002 | Bezalel
-10003 | Parto
-10004 | Chirstian
-10005 | Kyoichi
-10006 | Anneke
-10007 | Tzvetan
-10008 | Saniya
-10009 | Sumant
-10010 | Duangkaew
-;
-
-
 concatComplex
 from employees | sort emp_no | limit 10 | eval foo = " - ", x = concat(gender, foo) | eval name = concat(x, first_name, " ", last_name, ", ", concat(first_name, last_name)) | keep emp_no, name;
 

diff --git a/...est/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java b/...est/java/org/elasticsearch/xpack/esql/expression/function/scalar/nulls/CoalesceTests.java
@@ -59,6 +59,9 @@ protected void assertSimpleWithNulls(List<Object> data, Block value, int nullBlo
             if (v == null) {
                 continue;
             }
+            if (v instanceof List<?> l && l.size() == 1) {
+                v = l.get(0);
+            }
             assertThat(toJavaObject(value, 0), equalTo(v));
             return;
         }