Make sure we verify type on a present column to get expected result

svilen-mihaylov-elastic · svilen-mihaylov-elastic · commit 90530e7e1a37 · 2025-06-03T15:31:50.000-04:00
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
@@ -1354,16 +1354,16 @@ public void testFullTextFunctionsOnlyAllowedInWhere() throws Exception {
     }
 
     public void testMatchFunctionOnlyAllowedInWhere() throws Exception {
-        checkFullTextFunctionsOnlyAllowedInWhere("Match", "match(first_name, \"Anna\")", "function");
+        checkFullTextFunctionsOnlyAllowedInWhere("Match", "match(title, \"Anna\")", "function");
     }
 
     public void testTermFunctionOnlyAllowedInWhere() throws Exception {
         assumeTrue("term function capability not available", EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled());
-        checkFullTextFunctionsOnlyAllowedInWhere("Term", "term(first_name, \"Anna\")", "function");
+        checkFullTextFunctionsOnlyAllowedInWhere("Term", "term(title, \"Anna\")", "function");
     }
 
     public void testMatchOperatornOnlyAllowedInWhere() throws Exception {
-        checkFullTextFunctionsOnlyAllowedInWhere(":", "first_name:\"Anna\"", "operator");
+        checkFullTextFunctionsOnlyAllowedInWhere(":", "title:\"Anna\"", "operator");
     }
 
     private void checkFullTextFunctionsOnlyAllowedInWhere(String functionName, String functionInvocation, String functionType)

Original file line number	Diff line number	Diff line change
`@@ -1354,16 +1354,16 @@ public void testFullTextFunctionsOnlyAllowedInWhere() throws Exception {`
`1354`	`1354`	`}`
`1355`	`1355`
`1356`	`1356`	`public void testMatchFunctionOnlyAllowedInWhere() throws Exception {`
`1357`		`- checkFullTextFunctionsOnlyAllowedInWhere("Match", "match(first_name, \"Anna\")", "function");`
	`1357`	`+ checkFullTextFunctionsOnlyAllowedInWhere("Match", "match(title, \"Anna\")", "function");`
`1358`	`1358`	`}`
`1359`	`1359`
`1360`	`1360`	`public void testTermFunctionOnlyAllowedInWhere() throws Exception {`
`1361`	`1361`	`assumeTrue("term function capability not available", EsqlCapabilities.Cap.TERM_FUNCTION.isEnabled());`
`1362`		`- checkFullTextFunctionsOnlyAllowedInWhere("Term", "term(first_name, \"Anna\")", "function");`
	`1362`	`+ checkFullTextFunctionsOnlyAllowedInWhere("Term", "term(title, \"Anna\")", "function");`
`1363`	`1363`	`}`
`1364`	`1364`
`1365`	`1365`	`public void testMatchOperatornOnlyAllowedInWhere() throws Exception {`
`1366`		`- checkFullTextFunctionsOnlyAllowedInWhere(":", "first_name:\"Anna\"", "operator");`
	`1366`	`+ checkFullTextFunctionsOnlyAllowedInWhere(":", "title:\"Anna\"", "operator");`
`1367`	`1367`	`}`
`1368`	`1368`
`1369`	`1369`	`private void checkFullTextFunctionsOnlyAllowedInWhere(String functionName, String functionInvocation, String functionType)`