You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by bo...@apache.org on 2026/08/30 20:31:11 UTC
(grails-core) 01/01: Merge remote-tracking branch 'origin/fix/rx-criteria-list-8.1.x' into merge/16140-into-8.1.x
This is an automated email from the ASF dual-hosted git repository.
borinquenkid pushed a commit to branch chore/cleanup-AbstractCriteriaBuilder
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit be976712f3b8428b4abfbab6f7a3f0103d56817b
Merge: 3246987ff8 2acb2852a2
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Sun Aug 30 15:26:36 2026 -0500
Merge remote-tracking branch 'origin/fix/rx-criteria-list-8.1.x' into merge/16140-into-8.1.x
# Conflicts:
# grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/query/criteria/AbstractCriteriaBuilder.java
# grails-datamapping-core/src/test/groovy/grails/gorm/CriteriaBuilderSpec.groovy
.../gorm/CriteriaBuilderIntegrationSpec.groovy | 1 +
.../grails/gorm/rx/multitenancy/Tenants.groovy | 65 ++++++++++---
.../grails/gorm/rx/finders/CountByFinder.groovy | 14 ++-
.../grails/gorm/rx/multitenancy/TenantsSpec.groovy | 108 ++++++++++++++++++++-
.../rx/events/MultiTenantEventListenerSpec.groovy | 22 +----
.../gorm/rx/finders/CountByFinderSpec.groovy | 55 ++++++-----
grails-forge/gradle.properties | 2 +-
7 files changed, 201 insertions(+), 66 deletions(-)