Skip to content

Commit 32746fd

Browse files
committed
SQL: Fix incorrect HAVING equality (#31820)
Fix bug that causes `HAVING a = b` to be translated ad-litteram in Painless which uses `==` for equality checks not `=`. Close #31796 (cherry picked from commit 89cb087)
1 parent 8b73ceb commit 32746fd

File tree

3 files changed

+8
-2
lines changed
  • x-pack
    • plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/predicate
    • qa/sql

3 files changed

+8
-2
lines changed

x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/predicate/Equals.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ protected Equals replaceChildren(Expression newLeft, Expression newRight) {
2727
return new Equals(location(), newLeft, newRight);
2828
}
2929

30+
@Override
3031
public Object fold() {
3132
return Objects.equals(left().fold(), right().fold());
3233
}
@@ -38,6 +39,6 @@ public Equals swapLeftAndRight() {
3839

3940
@Override
4041
public String symbol() {
41-
return "=";
42+
return "==";
4243
}
4344
}

x-pack/qa/sql/no-security/src/test/java/org/elasticsearch/xpack/qa/sql/nosecurity/CliExplainIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void testExplainWithWhere() throws IOException {
6565
assertThat(readLine(), startsWith("----------"));
6666
assertThat(readLine(), startsWith("With[{}]"));
6767
assertThat(readLine(), startsWith("\\_Project[[?*]]"));
68-
assertThat(readLine(), startsWith(" \\_Filter[?i = 2]"));
68+
assertThat(readLine(), startsWith(" \\_Filter[?i == 2]"));
6969
assertThat(readLine(), startsWith(" \\_UnresolvedRelation[[][index=test],null,Unknown index [test]]"));
7070
assertEquals("", readLine());
7171

x-pack/qa/sql/src/main/resources/agg.sql-spec

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ SELECT COUNT(DISTINCT hire_date) AS count FROM test_emp;
8080
// Conditional COUNT
8181
aggCountAndHaving
8282
SELECT gender g, COUNT(*) c FROM "test_emp" GROUP BY g HAVING COUNT(*) > 10 ORDER BY gender;
83+
aggCountAndHavingEquality
84+
SELECT gender g, COUNT(*) c FROM "test_emp" GROUP BY g HAVING COUNT(*) = 10 ORDER BY gender;
8385
aggCountOnColumnAndHaving
8486
SELECT gender g, COUNT(gender) c FROM "test_emp" GROUP BY g HAVING COUNT(gender) > 10 ORDER BY gender;
8587
// NOT supported yet since Having introduces a new agg
@@ -91,6 +93,8 @@ aggCountOnColumnAndHavingOnAlias
9193
SELECT gender g, COUNT(gender) c FROM "test_emp" GROUP BY g HAVING c > 10 ORDER BY gender;
9294
aggCountOnColumnAndMultipleHaving
9395
SELECT gender g, COUNT(gender) c FROM "test_emp" GROUP BY g HAVING c > 10 AND c < 70 ORDER BY gender ;
96+
aggCountOnColumnAndMultipleHavingEquals
97+
SELECT gender g, COUNT(gender) c FROM "test_emp" GROUP BY g HAVING c > 10 AND c = 63 ORDER BY gender ;
9498
aggCountOnColumnAndMultipleHavingWithLimit
9599
SELECT gender g, COUNT(gender) c FROM "test_emp" GROUP BY g HAVING c > 10 AND c < 70 ORDER BY gender LIMIT 1;
96100
aggCountOnColumnAndHavingBetween
@@ -145,6 +149,7 @@ SELECT gender g, MIN(emp_no) m FROM "test_emp" GROUP BY g HAVING m BETWEEN 10 AN
145149
aggMinWithMultipleHavingOnAliasAndFunction
146150
SELECT gender g, MIN(emp_no) m FROM "test_emp" GROUP BY g HAVING m > 10 AND MIN(emp_no) < 99999 ORDER BY gender;
147151

152+
148153
// MAX
149154
aggMaxImplicit
150155
// tag::max

0 commit comments

Comments
 (0)