Change in the LogicalPlanBuilder.

Author: afoucret

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java

@@ -738,10 +738,9 @@ public PlanFactory visitCompletionCommand(EsqlBaseParser.CompletionCommandContex
         Source source = source(ctx);
         Expression prompt = expression(ctx.prompt);
         Literal inferenceId = inferenceId(ctx.inferenceId);
-        String targetFieldName = ctx.targetField == null
-            ? Completion.DEFAULT_OUTPUT_FIELD_NAME
-            : visitQualifiedName(ctx.targetField).name();
-        Attribute targetField = new ReferenceAttribute(source, targetFieldName, DataType.TEXT);
+        Attribute targetField = ctx.targetField == null
+            ? new UnresolvedAttribute(source, Completion.DEFAULT_OUTPUT_FIELD_NAME)
+            : visitQualifiedName(ctx.targetField);
 
         return p -> new Completion(source, p, inferenceId, prompt, targetField);
     }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

@@ -22,7 +22,6 @@
 import org.elasticsearch.xpack.esql.core.expression.NamedExpression;
 import org.elasticsearch.xpack.esql.core.expression.UnresolvedAttribute;
 import org.elasticsearch.xpack.esql.core.expression.predicate.operator.comparison.BinaryComparison;
-import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.elasticsearch.xpack.esql.expression.Order;
 import org.elasticsearch.xpack.esql.expression.UnresolvedNamePattern;
 import org.elasticsearch.xpack.esql.expression.function.UnresolvedFunction;
@@ -3423,7 +3422,7 @@ public void testCompletionUsingFieldAsPrompt() {
 
         assertThat(plan.prompt(), equalTo(attribute("prompt_field")));
         assertThat(plan.inferenceId(), equalTo(literalString("inferenceID")));
-        assertThat(plan.targetField(), equalTo(referenceAttribute("targetField", DataType.TEXT)));
+        assertThat(plan.targetField(), equalTo(attribute("targetField")));
     }
 
     public void testCompletionUsingFunctionAsPrompt() {
@@ -3433,7 +3432,7 @@ public void testCompletionUsingFunctionAsPrompt() {
 
         assertThat(plan.prompt(), equalTo(function("CONCAT", List.of(attribute("fieldA"), attribute("fieldB")))));
         assertThat(plan.inferenceId(), equalTo(literalString("inferenceID")));
-        assertThat(plan.targetField(), equalTo(referenceAttribute("targetField", DataType.TEXT)));
+        assertThat(plan.targetField(), equalTo(attribute("targetField")));
     }
 
     public void testCompletionDefaultFieldName() {
@@ -3443,7 +3442,7 @@ public void testCompletionDefaultFieldName() {
 
         assertThat(plan.prompt(), equalTo(attribute("prompt_field")));
         assertThat(plan.inferenceId(), equalTo(literalString("inferenceID")));
-        assertThat(plan.targetField(), equalTo(referenceAttribute("completion", DataType.TEXT)));
+        assertThat(plan.targetField(), equalTo(attribute("completion")));
     }
 
     public void testCompletionWithPositionalParameters() {
@@ -3454,7 +3453,7 @@ public void testCompletionWithPositionalParameters() {
 
         assertThat(plan.prompt(), equalTo(attribute("prompt_field")));
         assertThat(plan.inferenceId(), equalTo(literalString("inferenceId")));
-        assertThat(plan.targetField(), equalTo(referenceAttribute("completion", DataType.TEXT)));
+        assertThat(plan.targetField(), equalTo(attribute("completion")));
     }
 
     public void testCompletionWithNamedParameters() {
@@ -3465,7 +3464,7 @@ public void testCompletionWithNamedParameters() {
 
         assertThat(plan.prompt(), equalTo(attribute("prompt_field")));
         assertThat(plan.inferenceId(), equalTo(literalString("myInference")));
-        assertThat(plan.targetField(), equalTo(referenceAttribute("completion", DataType.TEXT)));
+        assertThat(plan.targetField(), equalTo(attribute("completion")));
     }
 
     public void testInvalidCompletion() {