Handle != as NOT EQUALS for JPQL.

See #3061.
spring-projects · Jul 11, 2023 · cc34823 · cc34823
1 parent efdb289
commit cc34823
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4 b/spring-data-jpa/src/main/antlr4/org/springframework/data/jpa/repository/query/Jpql.g4
@@ -164,7 +164,7 @@ update_clause
     ;
 
 update_item
-    : (identification_variable '.')? (single_valued_embeddable_object_field '.')* (state_field | single_valued_object_field) '=' new_value
+    : (identification_variable '.')? (single_valued_embeddable_object_field '.')* (state_field | single_valued_object_field) EQUAL new_value
     ;
 
 new_value
@@ -377,21 +377,21 @@ all_or_any_expression
 
 comparison_expression
     : string_expression comparison_operator (string_expression | all_or_any_expression)
-    | boolean_expression op=('=' | '<>') (boolean_expression | all_or_any_expression)
-    | enum_expression op=('=' | '<>') (enum_expression | all_or_any_expression)
+    | boolean_expression op=(EQUAL | NOT_EQUAL) (boolean_expression | all_or_any_expression)
+    | enum_expression op=(EQUAL | NOT_EQUAL) (enum_expression | all_or_any_expression)
     | datetime_expression comparison_operator (datetime_expression | all_or_any_expression)
-    | entity_expression op=('=' | '<>') (entity_expression | all_or_any_expression)
+    | entity_expression op=(EQUAL | NOT_EQUAL) (entity_expression | all_or_any_expression)
     | arithmetic_expression comparison_operator (arithmetic_expression | all_or_any_expression)
-    | entity_type_expression op=('=' | '<>') entity_type_expression
+    | entity_type_expression op=(EQUAL | NOT_EQUAL) entity_type_expression
     ;
 
 comparison_operator
-    : op='='
+    : op=EQUAL
     | op='>'
     | op='>='
     | op='<'
     | op='<='
-    | op='<>'
+    | op=NOT_EQUAL
     ;
 
 arithmetic_expression
@@ -841,6 +841,9 @@ VALUE                       : V A L U E;
 WHEN                        : W H E N;
 WHERE                       : W H E R E;
 
+EQUAL                       : '=' ;
+NOT_EQUAL                   : '<>' | '!=' ;
+
 
 CHARACTER                   : '\'' (~ ('\'' | '\\')) '\'' ;
 IDENTIFICATION_VARIABLE     : ('a' .. 'z' | 'A' .. 'Z' | '\u0080' .. '\ufffe' | '$' | '_') ('a' .. 'z' | 'A' .. 'Z' | '\u0080' .. '\ufffe' | '0' .. '9' | '$' | '_')* ;

diff --git a/...a/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java b/...a/src/test/java/org/springframework/data/jpa/repository/query/JpqlQueryRendererTests.java
@@ -948,4 +948,9 @@ void typeShouldBeAValidParameter() {
 		assertQuery("select e from Employee e where e.type = :_type");
 		assertQuery("select te from TestEntity te where te.type = :type");
 	}
+
+	@Test // GH-3061
+	void alternateNotEqualsOperatorShouldWork() {
+		assertQuery("select e from Employee e where e.firstName != :name");
+	}
 }