From 75e3ef938358c681b9c336d3a6f6843d1d0e4db6 Mon Sep 17 00:00:00 2001
From: subijayb <subijay.bhattacharya@nokia.com>
Date: Tue, 20 Feb 2024 16:51:16 +0530
Subject: [PATCH] HHH-17743 Allow updates outside transaction

---
 .../query/sqm/internal/QuerySqmImpl.java      |  1 -
 .../flush/NonTransactionalDataAccessTest.java | 24 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
index ecb6970ecc..22cd5bf738 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/QuerySqmImpl.java
@@ -661,7 +661,6 @@ public class QuerySqmImpl<R>
 	}
 
 	protected int doExecuteUpdate() {
-		getSession().prepareForQueryExecution( true );
 		return resolveNonSelectQueryPlan().executeUpdate( this );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
index c9e50a1fb1..92cebbe272 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/flush/NonTransactionalDataAccessTest.java
@@ -7,14 +7,17 @@
 package org.hibernate.orm.test.flush;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.EntityManager;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
 import jakarta.persistence.TransactionRequiredException;
 
 import org.hibernate.Session;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.Configuration;
+import org.hibernate.query.sqm.internal.QuerySqmImpl;
 
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -24,6 +27,7 @@ import org.junit.Test;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.core.IsNull.nullValue;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Andrea Boriero
@@ -130,8 +134,28 @@ public class NonTransactionalDataAccessTest extends BaseCoreFunctionalTestCase {
 		}
 	}
 
+	@Test
+	public void hhh17743Test() throws Exception {
+		allowUpdateOperationOutsideTransaction = "true";
+		rebuildSessionFactory();
+		prepareTest();
+
+		try(Session s = openSession();
+			EntityManager entityManager = s.getEntityManagerFactory().createEntityManager();) {
+
+			MyEntity entity = new MyEntity("N1");
+			entityManager.persist(entity);
+
+			QuerySqmImpl q = (QuerySqmImpl)entityManager.createNamedQuery("deleteByName");
+			q.setParameter("name", "N1");
+			int d = q.executeUpdate();
+			assertEquals(0, d);
+		}
+	}
+
 	@Entity(name = "MyEntity")
 	@Table(name = "MY_ENTITY")
+	@NamedQuery(name = "deleteByName", query = "delete from MyEntity where name = :name")
 	public static class MyEntity {
 		@Id
 		@GeneratedValue