This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
from a0e1b37bff Merge pull request #15436 from
apache/database-cleanup-feature
add afffd57064 fix: extend OSIV to manage sessions for all datasources
add 90f9ff78ca fix: harden afterCompletion to guarantee default session
cleanup
add f22dc661a4 fix: add connection name to OSIV logs and Geb integration
test
add c58749595f fix: use findByTitle for test isolation in OSIV Geb test
add 518ac1ad9c fix: accumulate flush exceptions across additional
datasource sessions
add b329022970 Merge branch '7.0.x' into fix/multi-datasource-osiv
add d97e5a17b8 fix: add debug logging for suppressed flush exceptions in
OSIV interceptor
new 314539fa93 Merge pull request #15425 from
apache/fix/multi-datasource-osiv
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
grails-data-hibernate5/grails-plugin/build.gradle | 1 +
.../GrailsOpenSessionInViewInterceptor.java | 138 ++++++++++++++-
.../support/MultiDataSourceSessionSpec.groovy | 193 +++++++++++++++++++++
.../datasources/OsivBookController.groovy} | 20 ++-
.../controllers/datasources}/UrlMappings.groovy | 9 +-
.../datasources/grails-app/domain/ds2/Book.groovy | 2 +
.../domain/ds2/{Book.groovy => Chapter.groovy} | 4 +-
.../grails-app/views/osivBook/show.gsp} | 14 +-
.../functionaltests/OsivGspRenderingSpec.groovy} | 20 ++-
.../functionaltests/pages/OsivBookPage.groovy} | 12 +-
.../grails-multiple-datasources/build.gradle | 6 +
.../datasources/SecondaryBookController.groovy | 78 +++++++++
.../controllers/datasources}/UrlMappings.groovy | 5 +-
.../MultiDataSourceWithSessionSpec.groovy | 86 +++++++++
14 files changed, 549 insertions(+), 39 deletions(-)
create mode 100644
grails-data-hibernate5/grails-plugin/src/test/groovy/org/grails/plugin/hibernate/support/MultiDataSourceSessionSpec.groovy
copy
grails-test-examples/{app1/grails-app/init/functionaltests/BootStrap.groovy =>
datasources/grails-app/controllers/datasources/OsivBookController.groovy} (68%)
copy grails-test-examples/{exploded/grails-app/controllers/exploded =>
datasources/grails-app/controllers/datasources}/UrlMappings.groovy (89%)
mode change 100755 => 100644
copy grails-test-examples/datasources/grails-app/domain/ds2/{Book.groovy =>
Chapter.groovy} (95%)
copy grails-test-examples/{app1/grails-app/views/contentNegotiation/error.gsp
=> datasources/grails-app/views/osivBook/show.gsp} (81%)
copy
grails-test-examples/{app1/src/integration-test/groovy/functionaltests/DataBindingSpec.groovy
=>
datasources/src/integration-test/groovy/functionaltests/OsivGspRenderingSpec.groovy}
(61%)
copy
grails-test-examples/{app1/src/integration-test/groovy/functionaltests/pages/BarListPage.groovy
=>
datasources/src/integration-test/groovy/functionaltests/pages/OsivBookPage.groovy}
(78%)
create mode 100644
grails-test-examples/hibernate5/grails-multiple-datasources/grails-app/controllers/datasources/SecondaryBookController.groovy
copy grails-test-examples/{plugins/exploded/grails-app/controllers/exploded =>
hibernate5/grails-multiple-datasources/grails-app/controllers/datasources}/UrlMappings.groovy
(92%)
mode change 100755 => 100644
create mode 100644
grails-test-examples/hibernate5/grails-multiple-datasources/src/integration-test/groovy/functionaltests/MultiDataSourceWithSessionSpec.groovy
