This is an automated email from the ASF dual-hosted git repository.
borinquenkid pushed a commit to branch merge-hibernate6
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 16dc1b4ba338a9f4326ee09fb3e72a45309a0604
Author: Walter Duque de Estrada <wbdu...@mac.com>
AuthorDate: Mon Aug 18 21:09:50 2025 -0500
more to HibernateHqlQuery
---
.../orm/hibernate/HibernateGormStaticApi.groovy | 5 ++--
.../orm/hibernate/query/HibernateHqlQuery.java | 4 +--
.../hibernate/HibernateGormStaticApiSpec.groovy | 34 ----------------------
3 files changed, 5 insertions(+), 38 deletions(-)
diff --git
a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
index 5be40fc1d8..28890dddd9 100644
---
a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
+++
b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/HibernateGormStaticApi.groovy
@@ -264,6 +264,7 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
@Override
List<D> findAll(CharSequence query, Map params, Map args) {
+
params = new LinkedHashMap(params)
args = new LinkedHashMap(args)
if(query instanceof GString) {
@@ -460,8 +461,8 @@ class HibernateGormStaticApi<D> extends GormStaticApi<D> {
}
return (List<D>) template.execute { Session session ->
- Query q = (Query)
session.createQuery(query.toString(),Object.class)
- def hibernateHqlQuery =
HibernateHqlQuery.createHqlQuery(session,q, datastore as
HibernateDatastore,sessionFactory,persistentEntity)
+// Query q = (Query)
session.createQuery(query.toString(),Object.class)
+ def hibernateHqlQuery = HibernateHqlQuery.createHqlQuery(session,
datastore as HibernateDatastore, sessionFactory, persistentEntity,
query.toString(), false)
template.applySettings(hibernateHqlQuery.getQuery())
hibernateHqlQuery.populateQuerySettings(params)
hibernateHqlQuery.populateQuerySettings(args)
diff --git
a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
index c3d8c77689..bb580c23c0 100644
---
a/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
+++
b/grails-data-hibernate6/core/src/main/groovy/org/grails/orm/hibernate/query/HibernateHqlQuery.java
@@ -70,9 +70,9 @@ public class HibernateHqlQuery extends Query {
, String sqlString
, boolean isNative
) {
- var q = isNative ? session.createNativeQuery(sqlString,
persistentEntity.getJavaClass()) : session.createQuery(sqlString,
persistentEntity.getJavaClass());
+ var q = isNative ? session.createNativeQuery(sqlString, Object.class)
: session.createQuery(sqlString, Object.class);
var hibernateSession = new HibernateSession( dataStore,
sessionFactory);
- HibernateHqlQuery hibernateHqlQuery = new
HibernateHqlQuery(hibernateSession, persistentEntity, q);
+ HibernateHqlQuery hibernateHqlQuery = new
HibernateHqlQuery(hibernateSession, null, q);
hibernateHqlQuery.setFlushMode(session.getHibernateFlushMode());
return hibernateHqlQuery;
}
diff --git
a/grails-data-hibernate6/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
b/grails-data-hibernate6/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
index e281c126ca..7bb99ffd55 100644
---
a/grails-data-hibernate6/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
+++
b/grails-data-hibernate6/core/src/test/groovy/org/grails/orm/hibernate/HibernateGormStaticApiSpec.groovy
@@ -362,41 +362,7 @@ class HibernateGormStaticApiSpec extends
HibernateGormDatastoreSpec {
instance.name == 'test2'
}
- void "Test findAll with named parameters"() {
- given:
- new HibernateGormStaticApiEntity(name: "test").save(failOnError: true)
- new HibernateGormStaticApiEntity(name: "test").save(failOnError: true)
- new HibernateGormStaticApiEntity(name: "other").save(flush: true,
failOnError: true)
-
- when:
- def instances = HibernateGormStaticApiEntity.findAll("from
HibernateGormStaticApiEntity where name = :name", [name: 'test'])
-
- then:
- instances.size() == 2
- }
-
- void "Test findWithSql"() {
- given:
- new HibernateGormStaticApiEntity(name: "test1").save(flush: true,
failOnError: true)
-
- when:
- def instance = HibernateGormStaticApiEntity.findWithSql("select * from
hibernate_gorm_static_api_entity where name = 'test1'")
- then:
- instance.name == 'test1'
- }
-
- void "Test findAllWithSql"() {
- given:
- new HibernateGormStaticApiEntity(name: "test").save(failOnError: true)
- new HibernateGormStaticApiEntity(name: "test").save(flush: true,
failOnError: true)
-
- when:
- def instances = HibernateGormStaticApiEntity.findAllWithSql("select *
from hibernate_gorm_static_api_entity where name = 'test'")
-
- then:
- instances.size() == 2
- }
void "Test executeQuery with positional params"() {
given:
