Issue #1727 - Fixed missing default FQN entity alias name.

Signed-off-by: Tomáš Kraus <tomas.kraus@oracle.com>
eclipse-ee4j · Oct 12, 2022 · 9adb0a8 · 9adb0a8
1 parent 140718f
commit 9adb0a8
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 3 deletions.
diff --git a/...est/java/org/eclipse/persistence/testing/tests/jpa/jpql/advanced/JUnitJPQLSimpleTest.java b/...est/java/org/eclipse/persistence/testing/tests/jpa/jpql/advanced/JUnitJPQLSimpleTest.java
@@ -215,7 +215,10 @@ public static Test suite() {
         suite.addTest(new JUnitJPQLSimpleTest("testOrderByWithParenthesesCalculatedAndNormalDefault"));
         suite.addTest(new JUnitJPQLSimpleTest("testOrderByWithParenthesesAllAttributes"));
         suite.addTest(new JUnitJPQLSimpleTest("testOrderByWithParenthesesAllAttributesHybrid"));
-
+        // Issue #1727 - Error execution delete operation without identification_variable on FQN entity
+        suite.addTest(new JUnitJPQLSimpleTest("testDeleteFQNEntityNoAlias"));
+        suite.addTest(new JUnitJPQLSimpleTest("testDeleteFQNEntityAlias"));
+
         return suite;
     }
 
@@ -2632,5 +2635,43 @@ public void testOrderByWithParenthesesAllAttributesHybrid() {
             closeEntityManager(em);
         }
     }
-
+
+    /**
+     * Test simple DELETE query with fully qualified entity class name and no alias.
+     */
+    public void testDeleteFQEntityNoAlias() {
+        EntityManager em = createEntityManager();
+        beginTransaction(em);
+        try {
+            Query query = em.createQuery(
+                    "DELETE FROM org.eclipse.persistence.testing.models.jpa.advanced.Employee " +
+                            "WHERE firstName = :fName AND lastName = :lName");
+            query.setParameter("fName", "Peter");
+            query.setParameter("lName", "Parker");
+            query.executeUpdate();
+        } finally {
+            rollbackTransaction(em);
+            closeEntityManager(em);
+        }
+    }
+
+    /**
+     * Test simple DELETE query with fully qualified entity class name and an alias.
+     */
+    public void testDeleteFQEntityAlias() {
+        EntityManager em = createEntityManager();
+        beginTransaction(em);
+        try {
+            Query query = em.createQuery(
+                    "DELETE FROM org.eclipse.persistence.testing.models.jpa.advanced.Employee e " +
+                            "WHERE e.firstName = :fName AND e.lastName = :lName");
+            query.setParameter("fName", "Peter");
+            query.setParameter("lName", "Parker");
+            query.executeUpdate();
+        } finally {
+            rollbackTransaction(em);
+            closeEntityManager(em);
+        }
+    }
+
 }
diff --git a/.../main/java/org/eclipse/persistence/jpa/jpql/parser/FullyQualifyPathExpressionVisitor.java b/.../main/java/org/eclipse/persistence/jpa/jpql/parser/FullyQualifyPathExpressionVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2022 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -68,6 +68,7 @@ public void visit(CollectionMemberDeclaration expression) {
     @Override
     public void visit(CollectionValuedPathExpression expression) {
         visitAbstractPathExpression(expression);
+        variableName = expression.toActualText().toLowerCase(Locale.ROOT);
     }
 
     @Override